From: Matthias Klose <doko@debian.org>
Date: Fri, 5 Feb 2021 13:46:56 +0000 (+0000)
Subject: ensurepip-wheels
X-Git-Tag: archive/raspbian/3.9.1-4+rpi1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3da3ab977c009ee0ee0cb0117fcfde0ade91a966;p=python3.9.git

ensurepip-wheels


Gbp-Pq: Name ensurepip-wheels.diff
---

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 97dfa7e..394afc6 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -1,3 +1,4 @@
+import glob
 import os
 import os.path
 import sys
@@ -6,20 +7,15 @@ import tempfile
 import subprocess
 from importlib import resources
 
-from . import _bundled
-
 
 
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "49.2.1"
-
-_PIP_VERSION = "20.2.3"
-
 _PROJECTS = [
-    ("setuptools", _SETUPTOOLS_VERSION, "py3"),
-    ("pip", _PIP_VERSION, "py2.py3"),
+    "setuptools",
+    "pip",
+    "pkg_resources",
 ]
 
 
@@ -42,7 +38,9 @@ def version():
     """
     Returns a string specifying the bundled version of pip.
     """
-    return _PIP_VERSION
+    wheel_names = glob.glob('/usr/share/python-wheels/pip-*.whl')
+    assert len(wheel_names) == 1, wheel_names
+    return os.path.basename(wheel_names[0]).split('-')[1]
 
 def _disable_pip_configuration_settings():
     # We deliberately ignore all pip environment variables
@@ -100,20 +98,44 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
         # omit pip and easy_install
         os.environ["ENSUREPIP_OPTIONS"] = "install"
 
+    # Debian: The bundled wheels are useless to us because we must use ones
+    # crafted from source code in the archive.  As we build the virtual
+    # environment, copy the wheels from the system location into the virtual
+    # environment, and place those wheels on sys.path.
+    def copy_wheels(wheels, destdir, paths):
+        for project in wheels:
+            wheel_names = glob.glob(
+                '/usr/share/python-wheels/{}-*.whl'.format(project))
+            if len(wheel_names) == 0:
+                raise RuntimeError('missing dependency wheel %s' % project)
+            assert len(wheel_names) == 1, wheel_names
+            wheel_name = os.path.basename(wheel_names[0])
+            path = os.path.join('/usr/share/python-wheels', wheel_name)
+            with open(path, 'rb') as fp:
+                whl = fp.read()
+            dest = os.path.join(destdir, wheel_name)
+            with open(dest, 'wb') as fp:
+                fp.write(whl)
+            paths.append(dest)
+
     with tempfile.TemporaryDirectory() as tmpdir:
+        # This directory is a "well known directory" which Debian has patched
+        # pip to look in when attempting to locate wheels to use to satisfy
+        # the dependencies that pip normally bundles but Debian has debundled.
+        # This is critically important and if this directory changes then both
+        # python-pip and python-virtualenv needs updated to match.
+        venv_wheel_dir = os.path.join(sys.prefix, 'share', 'python-wheels')
+        os.makedirs(venv_wheel_dir, exist_ok=True)
+        dependencies = [
+            os.path.basename(whl).split('-')[0]
+            for whl in glob.glob('/usr/share/python-wheels/*.whl')
+            ]
+        copy_wheels(dependencies, venv_wheel_dir, sys.path)
+
         # Put our bundled wheels into a temporary directory and construct the
         # additional paths that need added to sys.path
         additional_paths = []
-        for project, version, py_tag in _PROJECTS:
-            wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag)
-            whl = resources.read_binary(
-                _bundled,
-                wheel_name,
-            )
-            with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
-                fp.write(whl)
-
-            additional_paths.append(os.path.join(tmpdir, wheel_name))
+        copy_wheels(_PROJECTS, tmpdir, additional_paths)
 
         # Construct the arguments to be passed to the pip command
         args = ["install", "--no-cache-dir", "--no-index", "--find-links", tmpdir]
@@ -126,7 +148,7 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
         if verbosity:
             args += ["-" + "v" * verbosity]
 
-        return _run_pip(args + [p[0] for p in _PROJECTS], additional_paths)
+        return _run_pip(args + _PROJECTS, additional_paths)
 
 def _uninstall_helper(*, verbosity=0):
     """Helper to support a clean default uninstall process on Windows
@@ -140,7 +162,8 @@ def _uninstall_helper(*, verbosity=0):
         return
 
     # If the pip version doesn't match the bundled one, leave it alone
-    if pip.__version__ != _PIP_VERSION:
+    # Disabled for Debian, always using the version from the python3-pip package.
+    if False and pip.__version__ != _PIP_VERSION:
         msg = ("ensurepip will only uninstall a matching version "
                "({!r} installed, {!r} bundled)")
         print(msg.format(pip.__version__, _PIP_VERSION), file=sys.stderr)
@@ -153,7 +176,7 @@ def _uninstall_helper(*, verbosity=0):
     if verbosity:
         args += ["-" + "v" * verbosity]
 
-    return _run_pip(args + [p[0] for p in reversed(_PROJECTS)])
+    return _run_pip(args + reversed(_PROJECTS))
 
 
 def _main(argv=None):