pypy3.10/189-use-rpm-wheels.patch

59 lines
2.0 KiB
Diff
Raw Normal View History

2018-08-21 10:10:46 +00:00
diff --git a/lib-python/3/ensurepip/__init__.py b/lib-python/3/ensurepip/__init__.py
index 7a0d3ee..2c9d676 100644
2018-08-21 10:10:46 +00:00
--- a/lib-python/3/ensurepip/__init__.py
+++ b/lib-python/3/ensurepip/__init__.py
@@ -1,6 +1,7 @@
2018-08-21 10:10:46 +00:00
+import distutils.version
+import glob
import os
import os.path
-import pkgutil
import sys
import tempfile
@@ -8,9 +9,24 @@ import tempfile
2018-08-21 10:10:46 +00:00
__all__ = ["version", "bootstrap"]
2019-12-28 10:22:21 +00:00
-_SETUPTOOLS_VERSION = "41.2.0"
+_WHEEL_DIR = "/usr/share/python-wheels/"
2018-08-21 10:10:46 +00:00
2019-12-28 10:22:21 +00:00
-_PIP_VERSION = "19.2.3"
+_wheels = {}
+
2018-08-21 10:10:46 +00:00
+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))
2018-08-21 10:10:46 +00:00
+
+
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
+
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION),
@@ -93,13 +109,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
# additional paths that need added to sys.path
2018-08-21 10:10:46 +00:00
additional_paths = []
for project, version in _PROJECTS:
- wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
2018-08-21 10:10:46 +00:00
- 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]
2018-08-21 10:10:46 +00:00
+ 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))