Don't test Python 2 on Fedora 31+

This commit is contained in:
Miro Hrončok 2019-08-26 13:08:51 +02:00
parent bbc5fab8e5
commit 54cd2afa78

View File

@ -1,7 +1,9 @@
%global modname six %global modname six
# tests are enabled by default, but on Fedora 32+, Python 2 tests are skipped
%bcond_without tests %bcond_without tests
# python2 is enabled by default, Fedora 32+ exception is anticipated
%bcond_without python2 %bcond_without python2
%global python_wheelname %{modname}-%{version}-py2.py3-none-any.whl %global python_wheelname %{modname}-%{version}-py2.py3-none-any.whl
@ -30,7 +32,7 @@ Summary: %{summary}
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: python2-setuptools BuildRequires: python2-setuptools
%if %{with tests} %if %{with tests} && 0%{?fedora} < 32
BuildRequires: python2-pytest BuildRequires: python2-pytest
BuildRequires: python2-tkinter BuildRequires: python2-tkinter
%endif %endif
@ -79,8 +81,9 @@ Python 3 version.
%if %{with tests} %if %{with tests}
%check %check
# Ensure six module is used from the version being installed %if 0%{?fedora} < 32
PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -rfsxX test_six.py PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -rfsxX test_six.py
%endif
PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -rfsxX test_six.py PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -rfsxX test_six.py
%endif %endif