bpo-38488: Upgrade bundled versions of pip & setuptools (GH-20491) (GH-20900)

Co-authored-by: Xavier Fernandez <[email protected]>
(cherry picked from commit e63cc2f)

Co-authored-by: Ned Deily <[email protected]>

Author: miss-islington

Lib/ensurepip/__init__.py

@@ -9,13 +9,13 @@
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "41.2.0"
+_SETUPTOOLS_VERSION = "47.1.0"
 
-_PIP_VERSION = "19.2.3"
+_PIP_VERSION = "20.1.1"
 
 _PROJECTS = [
-    ("setuptools", _SETUPTOOLS_VERSION),
-    ("pip", _PIP_VERSION),
+    ("setuptools", _SETUPTOOLS_VERSION, "py3"),
+    ("pip", _PIP_VERSION, "py2.py3"),
 ]
 
 
@@ -102,8 +102,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 = pkgutil.get_data(
                 "ensurepip",
                 "_bundled/{}".format(wheel_name),

Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl

@@ -471,7 +471,7 @@ def do_test_with_pip(self, system_site_packages):
         #    executing pip with sudo, you may want sudo's -H flag."
         # where $HOME is replaced by the HOME environment variable.
         err = re.sub("^(WARNING: )?The directory .* or its parent directory "
-                     "is not owned by the current user .*$", "",
+                     "is not owned or is not writable by the current user.*$", "",
                      err, flags=re.MULTILINE)
         self.assertEqual(err.rstrip(), "")
         # Being fairly specific regarding the expected behaviour for the

Lib/ensurepip/_bundled/pip-20.1.1-py2.py3-none-any.whl

@@ -0,0 +1 @@
+Update ensurepip to install pip 20.1.1 and setuptools 47.1.0.