Upgrade bundled versions of pip & setuptools (#16782)

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 545fce656fd6f58c70306ed4bb3b9167d7afcb13..1ec49714c64590ced4a76d36674ced4fcd008aab 100644 (file)
--- 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
deleted file mode 100644 (file)
index 8118df8..0000000
Binary files a/Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl and /dev/null differ

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
new file mode 100644 (file)
index 0000000..925a59f
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-20.1-py2.py3-none-any.whl differ

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
similarity index 65%
rename from Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl
rename to Lib/ensurepip/_bundled/setuptools-46.1.3-py3-none-any.whl
index 82df6f63f4ee97380af0a29d8825ae775333b86d..fc3f6ccf4277d26506e05ffac16fdbe111c5d6ed 100644 (file)
Binary files a/Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl and b/Lib/ensurepip/_bundled/setuptools-46.1.3-py3-none-any.whl differ

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 (file)
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.