.gitignore

@@ -1 +1 @@
-SOURCES/wheel-0.30.0.tar.gz
+SOURCES/wheel-0.35.1.tar.gz

.python-wheel.metadata

@@ -1 +1 @@
-bf1b7cf2c46378b7300ad9d4e2b86e462cdd7f73 SOURCES/wheel-0.30.0.tar.gz
+0a1fec90e692f05b00e82cf78559408e7e15c1de SOURCES/wheel-0.35.1.tar.gz

SOURCES/remove-keyrings.alt-dependency.patch

@@ -1,27 +0,0 @@
-diff -uNr wheel-0.30.0.orig/setup.py wheel-0.30.0/setup.py
---- wheel-0.30.0.orig/setup.py	2017-07-29 22:08:53.000000000 +0200
-+++ wheel-0.30.0/setup.py	2018-02-23 13:30:44.736351678 +0100
-@@ -38,7 +38,7 @@
-       license='MIT',
-       packages=find_packages(),
-       extras_require={
--          'signatures': ['keyring', 'keyrings.alt'],
-+          'signatures': ['keyring'],
-           'signatures:sys_platform!="win32"': ['pyxdg'],
-           'faster-signatures': ['ed25519ll'],
-           'tool': [],
-diff -uNr wheel-0.30.0.orig/wheel/tool/__init__.py wheel-0.30.0/wheel/tool/__init__.py
---- wheel-0.30.0.orig/wheel/tool/__init__.py	2017-08-06 13:31:33.000000000 +0200
-+++ wheel-0.30.0/wheel/tool/__init__.py	2018-02-23 13:30:33.861317739 +0100
-@@ -31,10 +31,9 @@
-     try:
-         from ..signatures import keys
-         import keyring
--        assert keyring.get_keyring().priority
-     except (ImportError, AssertionError):
-         raise WheelError(
--            "Install wheel[signatures] (requires keyring, keyrings.alt, pyxdg) for signatures.")
-+            "Install wheel[signatures] (requires keyring, pyxdg) for signatures.")
- 
-     return keys.WheelKeys, keyring
- 

SPECS/python-wheel.spec

@@ -1,158 +1,229 @@
-# Note that the only function of bootstrap is that it disables the test suite:
+# The function of bootstrap is that it disables the wheel subpackage
-#   bcond_with bootstrap = tests enabled
 %bcond_with bootstrap
 
-# Note(hguemar): EL7 has no python3 stack but EPEL does
+# Default: when bootstrapping -> disable tests
-%if 0%{?rhel} && 0%{?rhel} <= 7 && 0%{!?epel:1}
+%if %{with bootstrap}
-%define _without_python3 1
+%bcond_with tests
+%else
+%bcond_without tests
 %endif
 
-%bcond_with python2
-%bcond_without python3
-
 %global pypi_name wheel
+%global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl
+%global python_wheeldir %{_datadir}/python%{python3_pkgversion}-wheels
 
 Name:           python-%{pypi_name}
-Version:        0.30.0
+Version:        0.35.1
-Release:        6%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Built-package format for Python
 
-License:        MIT
+# packaging is ASL 2.0 or BSD
+License:        MIT and (ASL 2.0 or BSD)
 URL:            https://github.com/pypa/wheel
 Source0:        %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
+# Exclude i686 arch. Due to a modularity issue it's being added to the
+# x86_64 compose of CRB, but we don't want to ship it at all.
+# See: https://projects.engineering.redhat.com/browse/RCM-72605
+ExcludeArch:    i686
 
-# Latest version of wheel requires the package keyrings.alt in order for the tests to pass,
+BuildRequires:  python%{python3_pkgversion}-devel
-# however it can't be packaged for Fedora as of yet since the code is not licensed,
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
-# and as a result wheel fails to build from source.
+BuildRequires:  python%{python3_pkgversion}-setuptools
-# Review request of keyrings.alt: https://bugzilla.redhat.com/show_bug.cgi?id=1365794
-# Until the license issue is resolved upstream, this patch is added to revert
-# the commit from wheel, that introduced this dependency.
-# https://bitbucket.org/pypa/wheel/commits/06841295888fdb430abe12aae29da92107e7360a
-Patch0: remove-keyrings.alt-dependency.patch
 
-%global _description \
+# python3 bootstrap: this is rebuilt before the final build of python3, which
-A built-package format for Python.\
+# adds the dependency on python3-rpm-generators, so we require it manually
-\
+BuildRequires:  python3-rpm-generators
-A wheel is a ZIP-format archive with a specially formatted filename and the\
+
-.whl extension. It is designed to contain all the files for a PEP 376\
+%if %{with tests}
-compatible install in a way that is very close to the on-disk format.
+BuildRequires:  python%{python3_pkgversion}-pytest
+# several tests compile extensions
+# those tests are skipped if gcc is not found
+BuildRequires:  gcc
+%endif
+
+%global _description %{expand:
+Wheel is the reference implementation of the Python wheel packaging standard,
+as defined in PEP 427.
+
+It has two different roles:
+
+ 1. A setuptools extension for building wheels that provides the bdist_wheel
+    setuptools command.
+ 2. A command line tool for working with wheel files.}
 
 %description %{_description}
 
-%if %{with python2}
+# Virtual provides for the packages bundled by wheel.
-%package -n     python2-%{pypi_name}
+# Actual version is written in src/wheel/vendored/packaging/_typing.py
+# and src/wheel/vendored/packaging/tags.py
+%global bundled %{expand:
+Provides:       bundled(python%{python3_version}dist(packaging)) = 20.4
+}
+
+
+%package -n     python%{python3_pkgversion}-%{pypi_name}
 Summary:        %{summary}
-BuildRequires:  python2-devel
+%{bundled}
-BuildRequires:  python2-setuptools
+Requires:       python%{python3_pkgversion}-setuptools
-%if ! %{with bootstrap}
-BuildRequires:  python2-pytest
-%endif
-%{?python_provide:%python_provide python2-%{pypi_name}}
 
-%description -n python2-%{pypi_name} %{_description}
+# Require alternatives version that implements the --keep-foreign flag
+Requires(postun): alternatives >= 1.19.1-1
+# python39 installs the alternatives master symlink to which we attach a slave
+Requires:       python%{python3_pkgversion}
+Requires(post): python%{python3_pkgversion}
+Requires(postun): python%{python3_pkgversion}
 
-Python 2 version.
+%description -n python%{python3_pkgversion}-%{pypi_name} %{_description}
-%endif
 
 
-%if %{with python3}
+%if %{without bootstrap}
-%package -n     python3-%{pypi_name}
+%package -n python%{python3_pkgversion}-%{pypi_name}-wheel
-Summary:        %{summary}
+Summary:        The Python wheel module packaged as a wheel
-BuildRequires:  python3-devel
+%{bundled}
-BuildRequires:  python3-setuptools
-%if ! %{with bootstrap}
-BuildRequires:  python3-pytest
-%endif
-%{?python_provide:%python_provide python3-%{pypi_name}}
 
-%description -n python3-%{pypi_name} %{_description}
+%description -n python%{python3_pkgversion}-%{pypi_name}-wheel
-
+A Python wheel of wheel to use with virtualenv.
-Python 3 version.
 %endif
 
 
 %prep
 %autosetup -n %{pypi_name}-%{version} -p1
-# remove unneeded shebangs
-sed -ie '1d' %{pypi_name}/{egg2wheel,wininst2wheel}.py
-
-# Remove tests for optional functionality which depends on bad crypto
-# (pycryptopp -> python-keyring -> python-wheel)
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1561576
-rm tests/test_signatures.py
-sed -i -e's/^def test_keygen():$/def skip_test_keygen():/' tests/test_tool.py
 
 
 %build
-%if %{with python2}
-%py2_build
-%endif
-%if %{with python3}
 %py3_build
-%endif
 
 
 %install
-%if %{with python3}
 %py3_install
 mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
+# Create an empty file to be used by `alternatives`
+touch %{buildroot}%{_bindir}/%{pypi_name}-3
+
+%if %{without bootstrap}
+# We can only use bdist_wheel when wheel is installed, hence we don't build the wheel in %%build
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
+%py3_build_wheel
+mkdir -p %{buildroot}%{python_wheeldir}
+install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
 %endif
 
-%if %{with python2}
-%py2_install
-mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python2_version}}
-%endif
 
-%if ! %{with bootstrap}
+%if %{with tests}
 %check
-rm setup.cfg
+rm setup.cfg  # to drop pytest coverage options configured there
-
+%pytest -v --ignore build
-# Remove part of the test that uses the "jsonschema" package
-sed -i '/jsonschema/d' tests/test_bdist_wheel.py
-
-%if %{with python2}
-PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -v --ignore build
-%endif
-%if %{with python3}
-PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
-%endif
 %endif
 
-%if %{with python2}
-%files -n python2-%{pypi_name}
-%license LICENSE.txt
-%doc CHANGES.txt README.rst
-%{_bindir}/%{pypi_name}-%{python2_version}
-%{python2_sitelib}/%{pypi_name}*
-%endif
 
-%if %{with python3}
+%post -n python%{python3_pkgversion}-%{pypi_name}
-%files -n python3-%{pypi_name}
+alternatives --add-slave python3 %{_bindir}/python%{python3_version} \
-%license LICENSE.txt
+    %{_bindir}/%{pypi_name}-3 \
-%doc CHANGES.txt README.rst
+    %{pypi_name}-3 \
     %{_bindir}/%{pypi_name}-%{python3_version}
-%{python3_sitelib}/%{pypi_name}*
+
+%postun -n python%{python3_pkgversion}-%{pypi_name}
+# Do this only during uninstall process (not during update)
+if [ $1 -eq 0 ]; then
+    alternatives --keep-foreign --remove-slave python3 %{_bindir}/python%{python3_version} \
+        %{pypi_name}-3
+fi
+
+
+%files -n python%{python3_pkgversion}-%{pypi_name}
+%license LICENSE.txt
+%doc README.rst
+%{_bindir}/%{pypi_name}-%{python3_version}
+%ghost %{_bindir}/%{pypi_name}-3
+%{python3_sitelib}/%{pypi_name}*/
+
+%if %{without bootstrap}
+%files -n python%{python3_pkgversion}-%{pypi_name}-wheel
+%license LICENSE.txt
+# we own the dir for simplicity
+%dir %{python_wheeldir}/
+%{python_wheeldir}/%{python_wheelname}
 %endif
 
 %changelog
-* Mon Aug 06 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-6
+* Thu Aug 05 2021 Tomas Orsava <torsava@redhat.com> - 1:0.35.1-4
-- Remove unversioned executables (only *-3.6 should be provided)
+- Adjusted the postun scriptlets to enable upgrading to RHEL 9
+- Resolves: rhbz#1933055
 
-* Mon Jun 25 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-5
+* Thu Feb 11 2021 Tomas Orsava <torsava@redhat.com> - 1:0.35.1-3
-- Don't build the python2 subpackage
+- Add back Epoch 1 to the package version because the original version with the
-  https://bugzilla.redhat.com/show_bug.cgi?id=1594353
+  epoch was available in CentOS Stream for a few days
+- Resolves: rhbz#1877430
 
-* Tue Jun 12 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-4
+* Wed Oct 21 2020 Tomas Orsava <torsava@redhat.com> - 1:0.35.1-2
-- Also remove test dependency on python3-jsonschema
+- Convert from Fedora to the python39 module in RHEL8
+- Resolves: rhbz#1877430
 
-* Wed May 30 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-3
+* Thu Sep 10 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1:0.35.1-1
-- Remove test dependency on python2-jsonschema
+- Update to 0.35.1
-  https://bugzilla.redhat.com/show_bug.cgi?id=1584189
+- Fixes: rhbz#1868821
 
-* Tue Apr 10 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-2
+* Mon Aug 10 2020 Miro Hrončok <mhroncok@redhat.com> - 1:0.34.2-1
-- Remove build-time (test) dependency on python-keyring
+- Update to 0.34.2
+- Drops Python 3.4 support
+- Fixes: rhbz#1795134
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.33.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.6-5
+- Rebuilt for Python 3.9
+
+* Thu May 21 2020 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.6-4
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.33.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Sep 09 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.6-2
+- Drop python2-wheel
+
+* Tue Aug 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.6-1
+- Update to 0.33.6 (#1708194)
+- Don't add the m ABI flag to wheel names on Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.1-5
+- Rebuilt for Python 3.8
+
+* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.1-4
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.33.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jul 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.1-2
+- Make /usr/bin/wheel Python 3
+
+* Mon Feb 25 2019 Charalampos Stratakis <cstratak@redhat.com> - 1:0.33.1-1
+- Update to 0.33.1
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.32.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Sep 30 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.32.0-1
+- Update to 0.32.0
+
+* Wed Aug 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.31.1-3
+- Create python-wheel-wheel package with the wheel of wheel
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.31.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Jul 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:0.31.1-1
+- Update to 0.31.1
+
+* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.30.0-3
+- Rebuilt for Python 3.7
+
+* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.30.0-2
+- Bootstrap for Python 3.7
 
 * Fri Feb 23 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:0.30.0-1
 - Update to 0.30.0