python3.9/SOURCES/00189-use-rpm-wheels.patch

79 lines
2.5 KiB
Diff
Raw Normal View History

2022-09-27 13:54:45 +00:00
From 12b919396f3fd24521b5ded51e18beb55973f0ff Mon Sep 17 00:00:00 2001
2021-11-04 00:29:03 +00:00
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
Downstream only: upstream bundles
We might eventually pursuit upstream support, but it's low prio
---
2021-12-07 19:06:13 +00:00
Lib/ensurepip/__init__.py | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
2021-11-04 00:29:03 +00:00
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
2022-09-27 13:54:45 +00:00
index e510cc7..5bd16a6 100644
2021-11-04 00:29:03 +00:00
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -1,3 +1,5 @@
+import distutils.version
+import glob
import os
import os.path
import sys
2021-12-07 19:06:13 +00:00
@@ -6,13 +8,29 @@ import tempfile
2021-11-04 00:29:03 +00:00
import subprocess
from importlib import resources
-from . import _bundled
-
__all__ = ["version", "bootstrap"]
2021-12-07 19:06:13 +00:00
-_SETUPTOOLS_VERSION = "58.1.0"
2022-09-27 13:54:45 +00:00
-_PIP_VERSION = "22.0.4"
2021-12-07 19:06:13 +00:00
+
2021-11-04 00:29:03 +00:00
+_WHEEL_DIR = "/usr/share/python-wheels/"
2021-12-07 19:06:13 +00:00
+
2021-11-04 00:29:03 +00:00
+_wheels = {}
2021-12-07 19:06:13 +00:00
+
2021-11-04 00:29:03 +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))
+
+
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
+
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
2021-12-07 19:06:13 +00:00
+
2021-11-04 00:29:03 +00:00
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION, "py3"),
2021-12-07 19:06:13 +00:00
("pip", _PIP_VERSION, "py3"),
@@ -101,13 +119,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
2021-11-04 00:29:03 +00:00
# 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)
+ 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())
additional_paths.append(os.path.join(tmpdir, wheel_name))
2022-09-27 13:54:45 +00:00
--
2.35.3