Update the ensurepip module to work with setuptools >= 45
setuptools 45.x is Python 3 only and changed the name of the wheel
This commit is contained in:
parent
64a5625b90
commit
2032d98680
@ -1,8 +1,8 @@
|
|||||||
diff --git a/lib-python/3/ensurepip/__init__.py b/lib-python/3/ensurepip/__init__.py
|
diff --git a/lib-python/3/ensurepip/__init__.py b/lib-python/3/ensurepip/__init__.py
|
||||||
index 9f5d151..8b81155 100644
|
index 7a0d3ee..2c9d676 100644
|
||||||
--- a/lib-python/3/ensurepip/__init__.py
|
--- a/lib-python/3/ensurepip/__init__.py
|
||||||
+++ b/lib-python/3/ensurepip/__init__.py
|
+++ b/lib-python/3/ensurepip/__init__.py
|
||||||
@@ -1,16 +1,27 @@
|
@@ -1,6 +1,7 @@
|
||||||
+import distutils.version
|
+import distutils.version
|
||||||
+import glob
|
+import glob
|
||||||
import os
|
import os
|
||||||
@ -11,20 +11,25 @@ index 9f5d151..8b81155 100644
|
|||||||
import sys
|
import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
|
@@ -8,9 +9,24 @@ import tempfile
|
||||||
__all__ = ["version", "bootstrap"]
|
__all__ = ["version", "bootstrap"]
|
||||||
|
|
||||||
+_WHEEL_DIR = "/usr/share/python-wheels/"
|
|
||||||
|
|
||||||
-_SETUPTOOLS_VERSION = "41.2.0"
|
-_SETUPTOOLS_VERSION = "41.2.0"
|
||||||
|
+_WHEEL_DIR = "/usr/share/python-wheels/"
|
||||||
|
|
||||||
-_PIP_VERSION = "19.2.3"
|
-_PIP_VERSION = "19.2.3"
|
||||||
|
+_wheels = {}
|
||||||
|
+
|
||||||
+def _get_most_recent_wheel_version(pkg):
|
+def _get_most_recent_wheel_version(pkg):
|
||||||
+ prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))
|
+ prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))
|
||||||
+ suffix = "-py2.py3-none-any.whl"
|
+ _wheels[pkg] = {}
|
||||||
|
+ for suffix in "-py2.py3-none-any.whl", "-py3-none-any.whl":
|
||||||
+ pattern = "{}*{}".format(prefix, suffix)
|
+ pattern = "{}*{}".format(prefix, suffix)
|
||||||
+ versions = (p[len(prefix):-len(suffix)] for p in glob.glob(pattern))
|
+ for path in glob.glob(pattern):
|
||||||
+ return str(max(versions, key=distutils.version.LooseVersion))
|
+ 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")
|
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
|
||||||
@ -33,16 +38,18 @@ index 9f5d151..8b81155 100644
|
|||||||
|
|
||||||
_PROJECTS = [
|
_PROJECTS = [
|
||||||
("setuptools", _SETUPTOOLS_VERSION),
|
("setuptools", _SETUPTOOLS_VERSION),
|
||||||
@@ -79,12 +95,9 @@ def bootstrap(*, root=None, upgrade=False, user=False,
|
@@ -93,13 +109,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
|
||||||
|
# additional paths that need added to sys.path
|
||||||
additional_paths = []
|
additional_paths = []
|
||||||
for project, version in _PROJECTS:
|
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(
|
- whl = pkgutil.get_data(
|
||||||
- "ensurepip",
|
- "ensurepip",
|
||||||
- "_bundled/{}".format(wheel_name),
|
- "_bundled/{}".format(wheel_name),
|
||||||
- )
|
- )
|
||||||
- with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
|
- with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
|
||||||
- fp.write(whl)
|
- 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(_WHEEL_DIR, wheel_name), "rb") as sfp:
|
||||||
+ with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
|
+ with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
|
||||||
+ fp.write(sfp.read())
|
+ fp.write(sfp.read())
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
Name: pypy3
|
Name: pypy3
|
||||||
Version: %{basever}.0
|
Version: %{basever}.0
|
||||||
%global pyversion 3.6
|
%global pyversion 3.6
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Python 3 implementation with a Just-In-Time compiler
|
Summary: Python 3 implementation with a Just-In-Time compiler
|
||||||
|
|
||||||
# LGPL and another free license we'd need to ask spot about are present in some
|
# LGPL and another free license we'd need to ask spot about are present in some
|
||||||
@ -863,6 +863,9 @@ CheckPyPy %{name}-stackless
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 12 2020 Miro Hrončok <mhroncok@redhat.com> - 7.3.0-3
|
||||||
|
- Update the ensurepip module to work with setuptools >= 45
|
||||||
|
|
||||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.0-2
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.0-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user