Remove python2-six, offlineimap has switched to Python 3

This commit is contained in:
Miro Hrončok 2021-03-15 16:57:01 +01:00
parent 1c9ad395b0
commit 760e26f6bc

View File

@ -1,22 +1,13 @@
%global modname six %global modname six
# tests are enabled by default, but on Fedora 32+, Python 2 tests are skipped # tests are enabled by default
%bcond_without tests %bcond_without tests
# python2 is enabled by default, Fedora 32+ exception is for offlineimap
# https://pagure.io/fesco/issue/2274
# The exception applies to Fedora only and has no target release yet
%if 0%{?fedora}
%bcond_without python2
%else
%bcond_with python2
%endif
%global python_wheelname %{modname}-%{version}-py2.py3-none-any.whl %global python_wheelname %{modname}-%{version}-py2.py3-none-any.whl
Name: python-%{modname} Name: python-%{modname}
Version: 1.15.0 Version: 1.15.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: Python 2 and 3 compatibility utilities Summary: Python 2 and 3 compatibility utilities
License: MIT License: MIT
@ -34,24 +25,6 @@ Python 2 and Python 3.
%description %{_description} %description %{_description}
%if %{with python2}
%package -n python2-%{modname}
Summary: %{summary}
%{?python_provide:%python_provide python2-%{modname}}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
%if %{with tests} && 0%{?fedora} < 32
BuildRequires: python2-pytest
BuildRequires: python2-tkinter
%endif
%description -n python2-%{modname} %{_description}
Python 2 version.
%endif
%package -n python%{python3_pkgversion}-%{modname} %package -n python%{python3_pkgversion}-%{modname}
Summary: %{summary} Summary: %{summary}
%{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}} %{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
@ -74,37 +47,18 @@ Python 3 version.
%build %build
%if %{with python2}
%py2_build
%endif
%py3_build_wheel %py3_build_wheel
%install %install
%if %{with python2}
%py2_install
%endif
%py3_install_wheel %{python_wheelname} %py3_install_wheel %{python_wheelname}
%if %{with tests} %if %{with tests}
%check %check
%if %{with python2} && 0%{?fedora} < 32
PYTHONPATH=%{buildroot}%{python2_sitelib} pytest-2 -rfsxX test_six.py
%endif
PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-3 -rfsxX test_six.py PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-3 -rfsxX test_six.py
%endif %endif
%if %{with python2}
%files -n python2-%{modname}
%license LICENSE
%doc README.rst documentation/index.rst
%{python2_sitelib}/%{modname}-*.egg-info/
%{python2_sitelib}/%{modname}.py*
%endif
%files -n python%{python3_pkgversion}-%{modname} %files -n python%{python3_pkgversion}-%{modname}
%license LICENSE %license LICENSE
%doc README.rst documentation/index.rst %doc README.rst documentation/index.rst
@ -114,6 +68,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-3 -rfsxX test_six.py
%changelog %changelog
* Mon Mar 15 2021 Miro Hrončok <mhroncok@redhat.com> - 1.15.0-5
- Remove python2-six
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-4 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild