| |
@@ -1,5 +1,5 @@
|
| |
diff --git a/lib-python/3/ensurepip/__init__.py b/lib-python/3/ensurepip/__init__.py
|
| |
- index 597a1ef9ee..3bfab52083 100644
|
| |
+ index 9dced0e..3bfab52 100644
|
| |
--- a/lib-python/3/ensurepip/__init__.py
|
| |
+++ b/lib-python/3/ensurepip/__init__.py
|
| |
@@ -1,6 +1,7 @@
|
| |
@@ -11,14 +11,16 @@
|
| |
import sys
|
| |
import runpy
|
| |
import tempfile
|
| |
- @@ -9,9 +10,24 @@ import subprocess
|
| |
+ @@ -8,9 +9,26 @@ import subprocess
|
| |
|
| |
- __all__ = ["version", "bootstrap"]
|
| |
|
| |
+ __all__ = ["version", "bootstrap"]
|
| |
+ -_PACKAGE_NAMES = ('setuptools', 'pip')
|
| |
-_SETUPTOOLS_VERSION = "58.1.0"
|
| |
+ -_PIP_VERSION = "22.0.4"
|
| |
+ +
|
| |
+_WHEEL_DIR = "/usr/share/python-wheels/"
|
| |
-
|
| |
- -_PIP_VERSION = "21.1.1"
|
| |
+ +
|
| |
+_wheels = {}
|
| |
+
|
| |
+def _get_most_recent_wheel_version(pkg):
|
| |
@@ -35,10 +37,11 @@
|
| |
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
|
| |
+
|
| |
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
|
| |
-
|
| |
+ +
|
| |
_PROJECTS = [
|
| |
("setuptools", _SETUPTOOLS_VERSION, "py3"),
|
| |
- @@ -101,13 +117,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
|
| |
+ ("pip", _PIP_VERSION, "py3"),
|
| |
+ @@ -99,13 +117,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:
|
| |