diff options
| author | Xavier Fernandez <xav.fernandez@gmail.com> | 2020-05-27 10:49:34 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 10:49:34 (GMT) |
| commit | feb0846c3a28b05b4cfbc6ab34c764957f3eff55 (patch) | |
| tree | 6b8d64f53494c3c6318a324d58c34f388e4b3212 | |
| parent | 7da46b676aed7111de34b57c8b942a7f3bb80327 (diff) | |
| download | cpython-feb0846c3a28b05b4cfbc6ab34c764957f3eff55.zip cpython-feb0846c3a28b05b4cfbc6ab34c764957f3eff55.tar.gz cpython-feb0846c3a28b05b4cfbc6ab34c764957f3eff55.tar.bz2 | |
Upgrade bundled versions of pip & setuptools (#16782)
| -rw-r--r-- | Lib/ensurepip/__init__.py | 12 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl | bin | 1414986 -> 0 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-20.1-py2.py3-none-any.whl | bin | 0 -> 1489786 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-46.1.3-py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl) | bin | 576332 -> 582683 bytes | |||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-10-15-23-28-11.bpo-38488.hFQNgA.rst | 1 |
5 files changed, 7 insertions, 6 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 545fce6..1ec4971 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -12,13 +12,13 @@ from . import _bundled __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "41.2.0" +_SETUPTOOLS_VERSION = "46.1.3" -_PIP_VERSION = "19.2.3" +_PIP_VERSION = "20.1" _PROJECTS = [ - ("setuptools", _SETUPTOOLS_VERSION), - ("pip", _PIP_VERSION), + ("setuptools", _SETUPTOOLS_VERSION, 'py3'), + ("pip", _PIP_VERSION, 'py2.py3'), ] @@ -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 in _PROJECTS: - wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) + for project, version, py_tag in _PROJECTS: + wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag) 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 differdeleted file mode 100644 index 8118df8..0000000 --- a/Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl +++ /dev/null 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 differnew file mode 100644 index 0000000..925a59f --- /dev/null +++ b/Lib/ensurepip/_bundled/pip-20.1-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-46.1.3-py3-none-any.whl Binary files differindex 82df6f6..fc3f6cc 100644 --- a/Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-46.1.3-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 new file mode 100644 index 0000000..95cf2f1 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-10-15-23-28-11.bpo-38488.hFQNgA.rst @@ -0,0 +1 @@ +Update ensurepip to install pip 20.1 and setuptools 46.1.3. |