65 lines
2.0 KiB
Diff
65 lines
2.0 KiB
Diff
From 6d3c9e128d693f5f211f94d2977ee990b3cfb69d 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(-)
|
|
|
|
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
|
|
index fc0edec6e3..4d17e413db 100644
|
|
--- a/Lib/ensurepip/__init__.py
|
|
+++ b/Lib/ensurepip/__init__.py
|
|
@@ -1,16 +1,27 @@
|
|
+import distutils.version
|
|
+import glob
|
|
import os
|
|
import os.path
|
|
-import pkgutil
|
|
import sys
|
|
import tempfile
|
|
|
|
|
|
__all__ = ["version", "bootstrap"]
|
|
|
|
+_WHEEL_DIR = "/usr/share/python-wheels/"
|
|
|
|
-_SETUPTOOLS_VERSION = "41.2.0"
|
|
|
|
-_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))
|
|
+
|
|
+
|
|
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
|
|
+
|
|
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
|
|
|
|
_PROJECTS = [
|
|
("setuptools", _SETUPTOOLS_VERSION),
|
|
@@ -96,12 +107,9 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
|
|
additional_paths = []
|
|
for project, version in _PROJECTS:
|
|
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)
|
|
+ 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.21.0
|
|
|