From f6c81506387d4e2baf08b3fc7258b5cabc388daf Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

Date: Wed, 15 Aug 2018 15:36:29 +0200

Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels

We keep them in /usr/share/python-wheels

---

 Lib/ensurepip/__init__.py | 33 ++++++++++++++++++++++-----------

 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py

index 545fce656f..f86992c90c 100644

--- a/Lib/ensurepip/__init__.py

+++ b/Lib/ensurepip/__init__.py

@@ -1,3 +1,5 @@

+import distutils.version

+import glob

 import os

 import os.path

 import sys

@@ -5,16 +7,28 @@ import runpy

 import tempfile

 from importlib import resources

-from . import _bundled

-

 __all__ = ["version", "bootstrap"]

+_WHEEL_DIR = "/usr/share/python-wheels/"

+

+_wheels = {}

+

+def _get_most_recent_wheel_version(pkg):

+    prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))

+    _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 = "41.2.0"

+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")

-_PIP_VERSION = "19.2.3"

+_PIP_VERSION = _get_most_recent_wheel_version("pip")

 _PROJECTS = [

     ("setuptools", _SETUPTOOLS_VERSION),

@@ -108,13 +122,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)

-            whl = resources.read_binary(

-                _bundled,

-                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())

             additional_paths.append(os.path.join(tmpdir, wheel_name))

-- 

2.26.2