.gitignore

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

.python-wheel.metadata

@@ -1 +1 @@
-e4a6afadbf3b6e7eb75ca46841eb7f3f6bff58cd SOURCES/wheel-0.36.2.tar.gz
+bf1b7cf2c46378b7300ad9d4e2b86e462cdd7f73 SOURCES/wheel-0.30.0.tar.gz

SOURCES/remove-keyrings.alt-dependency.patch

@@ -0,0 +1,27 @@
+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,233 +1,158 @@
-# The function of bootstrap is that it disables the wheel subpackage
+# Note that the only function of bootstrap is that it disables the test suite:
+#   bcond_with bootstrap = tests enabled
 %bcond_with bootstrap
 
-# Default: when bootstrapping -> disable tests
+# Note(hguemar): EL7 has no python3 stack but EPEL does
-%if %{with bootstrap}
+%if 0%{?rhel} && 0%{?rhel} <= 7 && 0%{!?epel:1}
-%bcond_with tests
+%define _without_python3 1
-%else
-%bcond_without tests
 %endif
 
-# Similar to what we have in pythonX.Y.spec files.
+%bcond_with python2
-# If enabled, provides unversioned executables and other stuff.
+%bcond_without python3
-# Disable it if you build this package in an alternative stack.
-%bcond_without main_python
 
 %global pypi_name wheel
-%global python_wheel_name %{pypi_name}-%{version}-py2.py3-none-any.whl
 
 Name:           python-%{pypi_name}
-Version:        0.36.2
+Version:        0.30.0
-Release:        7%{?dist}
+Release:        6%{?dist}
 Epoch:          1
 Summary:        Built-package format for Python
 
-# packaging is ASL 2.0 or BSD
+License:        MIT
-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
 
-BuildRequires:  python%{python3_pkgversion}-devel
+# Latest version of wheel requires the package keyrings.alt in order for the tests to pass,
-BuildRequires:  python%{python3_pkgversion}-setuptools
+# however it can't be packaged for Fedora as of yet since the code is not licensed,
+# and as a result wheel fails to build from source.
+# 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
 
-# python3 bootstrap: this is rebuilt before the final build of python3, which
+%global _description \
-# adds the dependency on python3-rpm-generators, so we require it manually
+A built-package format for Python.\
-BuildRequires:  python3-rpm-generators
+\
-
+A wheel is a ZIP-format archive with a specially formatted filename and the\
-%if %{with tests}
+.whl extension. It is designed to contain all the files for a PEP 376\
-BuildRequires:  python%{python3_pkgversion}-pytest
+compatible install in a way that is very close to the on-disk format.
-# 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}
 
-# Virtual provides for the packages bundled by wheel.
+%if %{with python2}
-# Actual version can be found in git history:
+%package -n     python2-%{pypi_name}
-# https://github.com/pypa/wheel/commits/master/src/wheel/vendored/packaging/tags.py
-%global bundled %{expand:
-Provides:       bundled(python3dist(packaging)) = 20.8
-}
-
-
-%package -n     python%{python3_pkgversion}-%{pypi_name}
 Summary:        %{summary}
-%{bundled}
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+%if ! %{with bootstrap}
+BuildRequires:  python2-pytest
+%endif
+%{?python_provide:%python_provide python2-%{pypi_name}}
 
-%description -n python%{python3_pkgversion}-%{pypi_name} %{_description}
+%description -n python2-%{pypi_name} %{_description}
+
+Python 2 version.
+%endif
 
 
-%if %{without bootstrap}
+%if %{with python3}
-%package -n     %{python_wheel_pkg_prefix}-%{pypi_name}-wheel
+%package -n     python3-%{pypi_name}
-Summary:        The Python wheel module packaged as a wheel
+Summary:        %{summary}
-%{bundled}
+BuildRequires:  python3-devel
-Provides:       %{name}-wheel = %{epoch}:%{version}-%{release}
+BuildRequires:  python3-setuptools
-Obsoletes:      %{name}-wheel < %{epoch}:%{version}-%{release}
+%if ! %{with bootstrap}
+BuildRequires:  python3-pytest
+%endif
+%{?python_provide:%python_provide python3-%{pypi_name}}
 
-# Older versions of python3-libs expect Python wheels at the old unversioned
+%description -n python3-%{pypi_name} %{_description}
-# location, so we conflict with the old Python versions that wouldn't work with
-# the new wheel location.
-Conflicts:      python3-libs < 3.9.9-2
 
-%description -n %{python_wheel_pkg_prefix}-%{pypi_name}-wheel
+Python 3 version.
-A Python wheel of wheel to use with virtualenv.
 %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}}
-%if %{with main_python}
-ln -s %{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3
-ln -s %{pypi_name}-3 %{buildroot}%{_bindir}/%{pypi_name}
 %endif
 
-%if %{without bootstrap}
+%if %{with python2}
-# We can only use bdist_wheel when wheel is installed, hence we don't build the wheel in %%build
+%py2_install
-export PYTHONPATH=%{buildroot}%{python3_sitelib}
+mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python2_version}}
-%py3_build_wheel
-mkdir -p %{buildroot}%{python_wheel_dir}
-install -p dist/%{python_wheel_name} -t %{buildroot}%{python_wheel_dir}
 %endif
 
-
+%if ! %{with bootstrap}
-%if %{with tests}
 %check
-rm setup.cfg  # to drop pytest coverage options configured there
+rm setup.cfg
-%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
 
-%files -n python%{python3_pkgversion}-%{pypi_name}
+%if %{with python2}
+%files -n python2-%{pypi_name}
 %license LICENSE.txt
-%doc README.rst
+%doc CHANGES.txt README.rst
+%{_bindir}/%{pypi_name}-%{python2_version}
+%{python2_sitelib}/%{pypi_name}*
+%endif
+
+%if %{with python3}
+%files -n python3-%{pypi_name}
+%license LICENSE.txt
+%doc CHANGES.txt README.rst
 %{_bindir}/%{pypi_name}-%{python3_version}
-%if %{with main_python}
+%{python3_sitelib}/%{pypi_name}*
-%{_bindir}/%{pypi_name}
-%{_bindir}/%{pypi_name}-3
-%endif
-%{python3_sitelib}/%{pypi_name}*/
-
-%if %{without bootstrap}
-%files -n %{python_wheel_pkg_prefix}-%{pypi_name}-wheel
-%license LICENSE.txt
-# we own the dir for simplicity
-%dir %{python_wheel_dir}/
-%{python_wheel_dir}/%{python_wheel_name}
 %endif
 
 %changelog
-* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1:0.36.2-7
+* Mon Aug 06 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-6
-- Add automatically generated Obsoletes tag with the python39- prefix
+- Remove unversioned executables (only *-3.6 should be provided)
-  for smoother upgrade from RHEL8
-- Related: rhbz#1990421
 
-* Wed Nov 24 2021 Tomas Orsava <torsava@redhat.com> - 1:0.36.2-6
+* Mon Jun 25 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-5
-- Conflict with old Python versions that use the old unversioned wheel location
+- Don't build the python2 subpackage
-- Resolves: rhbz#1982668
+  https://bugzilla.redhat.com/show_bug.cgi?id=1594353
 
-* Wed Sep 22 2021 Tomas Orsava <torsava@redhat.com> - 1:0.36.2-5
+* Tue Jun 12 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-4
-- Make the python-wheel-wheel subpackage versioned (python3-wheel-wheel),
+- Also remove test dependency on python3-jsonschema
-  and move its contents to a versioned directory /usr/share/python3-wheels
-- Resolves: rhbz#1982668
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.36.2-4
+* Wed May 30 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Remove test dependency on python2-jsonschema
-  Related: rhbz#1991688
+  https://bugzilla.redhat.com/show_bug.cgi?id=1584189
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.36.2-3
+* Tue Apr 10 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Remove build-time (test) dependency on python-keyring
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.36.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jan 04 2021 Miro Hrončok <mhroncok@redhat.com> - 1:0.36.2-1
-- Update to 0.36.2
-- Fixes: rhbz#1907227
-- Fixes: rhbz#1899553
-
-* Thu Sep 10 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1:0.35.1-1
-- Update to 0.35.1
-- Fixes: rhbz#1868821
-
-* Mon Aug 10 2020 Miro Hrončok <mhroncok@redhat.com> - 1:0.34.2-1
-- 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