#2 DO NOT MERGE: Prepare %check for switch to Python 3.6
Merged 5 years ago by tdawson. Opened 5 years ago by churchyard.
rpms/ churchyard/python3-pytest epel7_36_34  into  epel7

file modified
+4 -5
@@ -96,19 +96,18 @@ 

  

  %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

no initial comment

Metadata Update from @churchyard:
- Request assigned

5 years ago

Main python has been switched from python34 to python36.
Merging this in.

Pull-Request has been merged by tdawson

5 years ago
Metadata