| |
@@ -1,18 +1,18 @@
|
| |
- From 3b1cea43d3da4229c210c44f4694675cba341a19 Mon Sep 17 00:00:00 2001
|
| |
+ From 72d6cb277804f58b660bf96d8f5efff78d88491c 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 | 26 +++++++++++++++++---------
|
| |
- 1 file changed, 17 insertions(+), 9 deletions(-)
|
| |
+ Lib/ensurepip/__init__.py | 32 ++++++++++++++++++++++----------
|
| |
+ 1 file changed, 22 insertions(+), 10 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 @@
|
| |
+_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 @@
|
| |
|
| |
_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())
|
| |
Includes an unrelated commit that should not hurt.