From 5fb57be034ffeae1359b9bbcb726178e7ac628f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 13 Jul 2019 16:46:00 +0200 Subject: [PATCH] Make /usr/bin/pytest and /usr/bin/py.test Python 3 --- pytest.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pytest.spec b/pytest.spec index 0ede225..38bcbb1 100644 --- a/pytest.spec +++ b/pytest.spec @@ -67,7 +67,8 @@ BuildRequires: python3-twisted %endif %{?python_provide:%python_provide python3-%{name}} -Obsoletes: platform-python-%{name} < %{version}-%{release} +Provides: pytest = %{version}-%{release} +Conflicts: python2-pytest < 4.6 %description -n python3-%{name} py.test provides simple, yet powerful testing for Python. @@ -94,9 +95,9 @@ ln -snf pytest-%{python3_version} %{buildroot}%{_bindir}/pytest-3 mv %{buildroot}%{_bindir}/py.test %{buildroot}%{_bindir}/py.test-%{python3_version} ln -snf py.test-%{python3_version} %{buildroot}%{_bindir}/py.test-3 -# We use 2.X per default, uncomment once it changes -# ln -snf pytest-%{python3_version} %{buildroot}%{_bindir}/pytest -# ln -snf py.test-%{python3_version} %{buildroot}%{_bindir}/py.test +# We use 3.X per default +ln -snf pytest-%{python3_version} %{buildroot}%{_bindir}/pytest +ln -snf py.test-%{python3_version} %{buildroot}%{_bindir}/py.test %if %{with docs} mkdir -p _htmldocs/html @@ -128,10 +129,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \ %doc _htmldocs/html %endif %license LICENSE -#{_bindir}/pytest +%{_bindir}/pytest %{_bindir}/pytest-3 %{_bindir}/pytest-%{python3_version} -#{_bindir}/py.test +%{_bindir}/py.test %{_bindir}/py.test-3 %{_bindir}/py.test-%{python3_version} %{python3_sitelib}/pytest-*.egg-info/ @@ -142,6 +143,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \ %changelog * Mon Jul 01 2019 Miro Hrončok - 4.6.4-1 - Update to 4.6.4, move python2-pytest to its own source package +- Make /usr/bin/pytest and /usr/bin/py.test Python 3 * Fri Jun 21 2019 Petr Viktorin - 4.4.1-2 - Remove optional test dependencies for Python 2 entirely