import python-wheel-0.30.0-15.module+el8.0.0+3897+24372398

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

@@ -20,7 +20,7 @@
 
 Name:           python-%{pypi_name}
 Version:        0.30.0
-Release:        13%{?dist}
+Release:        15%{?dist}
 Epoch:          1
 Summary:        Built-package format for Python
 
@@ -29,14 +29,10 @@ URL:            https://github.com/pypa/wheel
 Source0:        %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
 
-# Latest version of wheel requires the package keyrings.alt in order for the tests to pass,
-# 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
+# We need to remove wheel's own implementation of crypto due to FIPS concerns.
+# See more: https://bugzilla.redhat.com/show_bug.cgi?id=1732325
+# Upstream commit: https://github.com/pypa/wheel/commit/d3f5918ccbb1c79e2fc42b7766626a0aa20dc438
+Patch0: removed-wheel-signing-and-verifying-features.patch
 
 %global _description \
 A built-package format for Python.\
@@ -93,12 +89,6 @@ Python 3 version.
 # 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}
@@ -177,6 +167,14 @@ fi
 %endif
 
 %changelog
+* Tue Aug 06 2019 Tomas Orsava <torsava@redhat.com> - 1:0.30.0-15
+- Fixed Patch0, which previously broken the metadata.json file generation
+Resolves: rhbz#1732325 rhbz#1732326
+
+* Thu Jul 25 2019 Tomas Orsava <torsava@redhat.com> - 1:0.30.0-14
+- Removed wheel's own implementation of crypto due to FIPS concerns
+Resolves: rhbz#1732325 rhbz#1732326
+
 * Wed Apr 03 2019 Tomas Orsava <torsava@redhat.com> - 1:0.30.0-13
 - Bumping due to problems with modular RPM upgrade path (#1695587)
 - Related: rhbz#1693974