From 97e784020067eef1102cdae91c18874972e204b7 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Feb 27 2020 12:59:05 +0000
Subject: Update the ensurepip module to work with setuptools >= 45


setuptools 45.x is Python 3 only and changed the name of the wheel

---

diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch
index 448ad4c..c90cb14 100644
--- a/00189-use-rpm-wheels.patch
+++ b/00189-use-rpm-wheels.patch
@@ -9,10 +9,10 @@ We keep them in /usr/share/python-wheels
  1 file changed, 17 insertions(+), 9 deletions(-)
 
 diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
-index fc0edec6e3..4d17e413db 100644
+index fc0edec6e3..731817a3f0 100644
 --- a/Lib/ensurepip/__init__.py
 +++ b/Lib/ensurepip/__init__.py
-@@ -1,16 +1,27 @@
+@@ -1,16 +1,31 @@
 +import distutils.version
 +import glob
  import os
@@ -27,14 +27,18 @@ index fc0edec6e3..4d17e413db 100644
 +_WHEEL_DIR = "/usr/share/python-wheels/"
  
 -_SETUPTOOLS_VERSION = "41.2.0"
++_wheels = {}
  
 -_PIP_VERSION = "19.2.3"
 +def _get_most_recent_wheel_version(pkg):
 +    prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))
-+    suffix = "-py2.py3-none-any.whl"
-+    pattern = "{}*{}".format(prefix, suffix)
-+    versions = (p[len(prefix):-len(suffix)] for p in glob.glob(pattern))
-+    return str(max(versions, key=distutils.version.LooseVersion))
++    _wheels[pkg] = {}
++    for suffix in "-py2.py3-none-any.whl", "-py3-none-any.whl":
++        pattern = "{}*{}".format(prefix, suffix)
++        for path in glob.glob(pattern):
++            version_str = path[len(prefix):-len(suffix)]
++            _wheels[pkg][version_str] = os.path.basename(path)
++    return str(max(_wheels[pkg], key=distutils.version.LooseVersion))
 +
 +
 +_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
@@ -43,16 +47,18 @@ index fc0edec6e3..4d17e413db 100644
  
  _PROJECTS = [
      ("setuptools", _SETUPTOOLS_VERSION),
-@@ -96,12 +107,9 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+@@ -95,13 +110,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+         # additional paths that need added to sys.path
          additional_paths = []
          for project, version in _PROJECTS:
-             wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
+-            wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
 -            whl = pkgutil.get_data(
 -                "ensurepip",
 -                "_bundled/{}".format(wheel_name),
 -            )
 -            with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
 -                fp.write(whl)
++            wheel_name = _wheels[project][version]
 +            with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp:
 +                with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
 +                    fp.write(sfp.read())
diff --git a/python38.spec b/python38.spec
index a309ead..3c88309 100644
--- a/python38.spec
+++ b/python38.spec
@@ -17,7 +17,7 @@ URL: https://www.python.org/
 %global prerel rc2
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Python
 
 
@@ -1570,6 +1570,9 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Mon Feb 24 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8.2~rc2-2
+- Update the ensurepip module to work with setuptools >= 45
+
 * Mon Feb 24 2020 Marcel Plch <mplch@redhat.com> - 3.8.2~rc2-1
 - Rebased to 3.8.2rc2