From 960caa8d9fd543efca9603254afcd9899ba99caa Mon Sep 17 00:00:00 2001 From: Miro HronĨok Date: Feb 05 2019 12:50:02 +0000 Subject: Prepare %check for switch to Python 3.6 --- diff --git a/python3-pytest.spec b/python3-pytest.spec index e420e4e..626eaff 100644 --- a/python3-pytest.spec +++ b/python3-pytest.spec @@ -96,19 +96,18 @@ rst2html README.rst > README.html %check PATH=%{buildroot}%{_bindir}:${PATH} \ -PYTHONPATH=%{buildroot}%{python3_sitelib} \ - %{buildroot}%{_bindir}/py.test-%{python3_version} -r s testing +PYTHONPATH=%{buildroot}%{python3_other_sitelib} \ + %{buildroot}%{_bindir}/py.test-%{python3_other_version} -r s testing # Python 3.6 has a new exception: ModuleNotFoundError # The tests of pytest 2.9.x are not yet ready for that sed -i 's/E ImportError/E ModuleNotFoundError/' testing/acceptance_test.py testing/test_terminal.py sed -i 's/\*UNEXPECTED\*ImportError\*/*UNEXPECTED*ModuleNotFoundError*/' testing/test_doctest.py sed -i 's/\*ImportError\*/*ModuleNotFoundError*/' testing/test_terminal.py -# TODO once py3_other is 3.4, this %%check section needs reordering PATH=%{buildroot}%{_bindir}:${PATH} \ -PYTHONPATH=%{buildroot}%{python3_other_sitelib} \ - %{buildroot}%{_bindir}/py.test-%{python3_other_version} -r s testing +PYTHONPATH=%{buildroot}%{python3_sitelib} \ + %{buildroot}%{_bindir}/py.test-%{python3_version} -r s testing %files -n python%{python3_pkgversion}-pytest