diff options
| author | Victor Stinner <vstinner@python.org> | 2020-05-28 13:57:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 13:57:49 (GMT) |
| commit | 4fd4963ccce5c12f742303dab6e43818b1133c7e (patch) | |
| tree | 3c2a86e2785ff9c8a2d0cbe3ec1891a8fd2170ea | |
| parent | 5f4b229df7812f1788287095eb6b138bb21876a4 (diff) | |
| download | cpython-4fd4963ccce5c12f742303dab6e43818b1133c7e.zip cpython-4fd4963ccce5c12f742303dab6e43818b1133c7e.tar.gz cpython-4fd4963ccce5c12f742303dab6e43818b1133c7e.tar.bz2 | |
Revert "Upgrade bundled versions of pip & setuptools (#16782)" (GH-20484)
This reverts commit feb0846c3a28b05b4cfbc6ab34c764957f3eff55.
| -rw-r--r-- | Lib/ensurepip/__init__.py | 12 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl | bin | 0 -> 1414986 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-20.1-py2.py3-none-any.whl | bin | 1489786 -> 0 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-46.1.3-py3-none-any.whl) | bin | 582683 -> 576332 bytes | |||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-10-15-23-28-11.bpo-38488.hFQNgA.rst | 1 |
5 files changed, 6 insertions, 7 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 1ec4971..545fce6 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -12,13 +12,13 @@ from . import _bundled __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "46.1.3" +_SETUPTOOLS_VERSION = "41.2.0" -_PIP_VERSION = "20.1" +_PIP_VERSION = "19.2.3" _PROJECTS = [ - ("setuptools", _SETUPTOOLS_VERSION, 'py3'), - ("pip", _PIP_VERSION, 'py2.py3'), + ("setuptools", _SETUPTOOLS_VERSION), + ("pip", _PIP_VERSION), ] @@ -107,8 +107,8 @@ def _bootstrap(*, root=None, upgrade=False, user=False, # Put our bundled wheels into a temporary directory and construct the # 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) + for project, version in _PROJECTS: + wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) whl = resources.read_binary( _bundled, wheel_name, diff --git a/Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl Binary files differnew file mode 100644 index 0000000..8118df8 --- /dev/null +++ b/Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/pip-20.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-20.1-py2.py3-none-any.whl Binary files differdeleted file mode 100644 index 925a59f..0000000 --- a/Lib/ensurepip/_bundled/pip-20.1-py2.py3-none-any.whl +++ /dev/null diff --git a/Lib/ensurepip/_bundled/setuptools-46.1.3-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl Binary files differindex fc3f6cc..82df6f6 100644 --- a/Lib/ensurepip/_bundled/setuptools-46.1.3-py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl diff --git a/Misc/NEWS.d/next/Library/2019-10-15-23-28-11.bpo-38488.hFQNgA.rst b/Misc/NEWS.d/next/Library/2019-10-15-23-28-11.bpo-38488.hFQNgA.rst deleted file mode 100644 index 95cf2f1..0000000 --- a/Misc/NEWS.d/next/Library/2019-10-15-23-28-11.bpo-38488.hFQNgA.rst +++ /dev/null @@ -1 +0,0 @@ -Update ensurepip to install pip 20.1 and setuptools 46.1.3. |