Upgrade bundled versions of pip & setuptools (#16782)

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),
+    ("setuptools", _SETUPTOOLS_VERSION, 'py3'),
-    ("pip", _PIP_VERSION),
+    ("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:
+        for project, version, py_tag in _PROJECTS:
-            wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
+            wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag)
             whl = resources.read_binary(
                 _bundled,
                 wheel_name,

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.