pypy/189-use-rpm-wheels.patch

90 lines
3.0 KiB
Diff
Raw Permalink Normal View History

2018-08-21 10:10:46 +00:00
diff --git a/lib-python/2.7/ensurepip/__init__.py b/lib-python/2.7/ensurepip/__init__.py
2020-04-22 10:38:46 +00:00
index 78ffd23..225c90a 100644
2018-08-21 10:10:46 +00:00
--- a/lib-python/2.7/ensurepip/__init__.py
+++ b/lib-python/2.7/ensurepip/__init__.py
2020-04-22 10:38:46 +00:00
@@ -1,11 +1,14 @@
2018-08-21 10:10:46 +00:00
#!/usr/bin/env python2
from __future__ import print_function
+import distutils.version
+import glob
import os
import os.path
2020-04-22 10:38:46 +00:00
import pkgutil
2018-08-21 10:10:46 +00:00
import shutil
import sys
2020-04-22 10:38:46 +00:00
+import runpy
2018-08-21 10:10:46 +00:00
import tempfile
2020-04-22 10:38:46 +00:00
import warnings
2018-08-21 10:10:46 +00:00
2020-04-22 10:38:46 +00:00
@@ -13,9 +16,24 @@ import warnings
2018-08-21 10:10:46 +00:00
__all__ = ["version", "bootstrap"]
2020-04-22 10:38:46 +00:00
-_SETUPTOOLS_VERSION = "44.0.0"
+_WHEEL_DIR = "/usr/share/python-wheels/"
2018-08-21 10:10:46 +00:00
2020-04-22 10:38:46 +00:00
-_PIP_VERSION = "20.0.2"
+_wheels = {}
+
2018-08-21 10:10:46 +00:00
+def _get_most_recent_wheel_version(pkg):
+ prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))
2020-04-22 10:38:46 +00:00
+ _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),
2020-04-22 10:38:46 +00:00
@@ -28,13 +46,18 @@ def _run_pip(args, additional_paths=None):
if additional_paths is not None:
sys.path = additional_paths + sys.path
- # Install the bundled pip, filtering the PipDeprecationWarning
- import pip._internal.cli.main
- from pip._internal.utils.deprecation import PipDeprecationWarning
- with warnings.catch_warnings():
- warnings.filterwarnings('ignore', category=PipDeprecationWarning)
- return pip._internal.cli.main.main(args)
+ # Invoke pip as if it's the main module, and catch the exit.
+ backup_argv = sys.argv[:]
+ sys.argv[1:] = args
+ try:
+ # run_module() alters sys.modules and sys.argv, but restores them at exit
+ runpy.run_module("pip", run_name="__main__", alter_sys=True)
+ except SystemExit as exc:
+ return exc.code
+ finally:
+ sys.argv[:] = backup_argv
+ raise SystemError("pip did not exit, this should never happen")
def version():
"""
@@ -88,13 +111,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:
2020-04-22 10:38:46 +00:00
- 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)
2020-04-22 10:38:46 +00:00
+ 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))