| |
@@ -1,5 +1,5 @@
|
| |
diff --git a/lib-python/3/ensurepip/__init__.py b/lib-python/3/ensurepip/__init__.py
|
| |
- index 94d40b0..9135b80 100644
|
| |
+ index 8289c49..f0d7106 100644
|
| |
--- a/lib-python/3/ensurepip/__init__.py
|
| |
+++ b/lib-python/3/ensurepip/__init__.py
|
| |
@@ -1,3 +1,5 @@
|
| |
@@ -8,14 +8,16 @@
|
| |
import os
|
| |
import os.path
|
| |
import pkgutil
|
| |
- @@ -9,9 +11,24 @@ import tempfile
|
| |
- __all__ = ["version", "bootstrap"]
|
| |
+ @@ -7,9 +9,26 @@ import tempfile
|
| |
|
| |
|
| |
+ __all__ = ["version", "bootstrap"]
|
| |
+ -_PACKAGE_NAMES = ('setuptools', 'pip')
|
| |
-_SETUPTOOLS_VERSION = "47.1.0"
|
| |
+ -_PIP_VERSION = "22.0.4"
|
| |
+ +
|
| |
+_WHEEL_DIR = "/usr/share/python-wheels/"
|
| |
-
|
| |
- -_PIP_VERSION = "20.1.1"
|
| |
+ +
|
| |
+_wheels = {}
|
| |
+
|
| |
+def _get_most_recent_wheel_version(pkg):
|
| |
@@ -32,10 +34,11 @@
|
| |
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
|
| |
+
|
| |
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
|
| |
-
|
| |
+ +
|
| |
_PROJECTS = [
|
| |
("setuptools", _SETUPTOOLS_VERSION, "py3"),
|
| |
- @@ -103,13 +120,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
|
| |
+ ("pip", _PIP_VERSION, "py3"),
|
| |
+ @@ -100,13 +119,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
|
| |
# additional paths that need added to sys.path
|
| |
additional_paths = []
|
| |
for project, version, py_tag in _PROJECTS:
|
| |
@@ -50,6 +53,6 @@
|
| |
+ 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))
|
| |
-
|
| |
+
|
| |