From: Victor Stinner <vstinner@python.org>
Date: Thu, 28 May 2020 13:57:49 +0000 (+0200)
Subject: Revert "Upgrade bundled versions of pip & setuptools (#16782)" (GH-20484)
X-Git-Tag: v3.10.0a1~787
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fd4963ccce5c12f742303dab6e43818b1133c7e;p=thirdparty%2FPython%2Fcpython.git

Revert "Upgrade bundled versions of pip & setuptools (#16782)" (GH-20484)

This reverts commit feb0846c3a28b05b4cfbc6ab34c764957f3eff55.
---

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 1ec49714c645..545fce656fd6 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
new file mode 100644
index 000000000000..8118df8ac194
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl 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
deleted file mode 100644
index 925a59f4c2d8..000000000000
Binary files a/Lib/ensurepip/_bundled/pip-20.1-py2.py3-none-any.whl and /dev/null differ
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
similarity index 65%
rename from Lib/ensurepip/_bundled/setuptools-46.1.3-py3-none-any.whl
rename to Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl
index fc3f6ccf4277..82df6f63f4ee 100644
Binary files a/Lib/ensurepip/_bundled/setuptools-46.1.3-py3-none-any.whl and b/Lib/ensurepip/_bundled/setuptools-41.2.0-py2.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
deleted file mode 100644
index 95cf2f1b5ed4..000000000000
--- 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.