[3.9] bpo-43930: Update bundled pip to 21.1 and setuptools to 56.0.0 (GH-25578)

(cherry picked from commit 196983563d05e32d2dcf217e955a919f9e0c25e1)

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 97dfa7ea71f8ff91b506dbd7d3e5fe5072f15a45..783b3232c80fc4db5ba58bf59f36a9c6d01ef496 100644 (file)
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -13,13 +13,13 @@ from . import _bundled
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "49.2.1"
+_SETUPTOOLS_VERSION = "56.0.0"
 
-_PIP_VERSION = "20.2.3"
+_PIP_VERSION = "21.1"
 
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
-    ("pip", _PIP_VERSION, "py2.py3"),
+    ("pip", _PIP_VERSION, "py3"),
 ]
 
 

diff --git a/Lib/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl
similarity index 51%
rename from Lib/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl
index 7ebdc0f31d4e3ec28cab71df496213e7be7711bf..59395be72f135f40c9e485280c350d9315ecc6be 100644 (file)
Binary files a/Lib/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl differ

diff --git a/Lib/ensurepip/_bundled/setuptools-49.2.1-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
similarity index 66%
rename from Lib/ensurepip/_bundled/setuptools-49.2.1-py3-none-any.whl
rename to Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
index 308e2f2ed5ed9b3697944c8f8ff24d7853159891..264ef10e8266795ddbc54885d40aa3de1803daa6 100644 (file)
Binary files a/Lib/ensurepip/_bundled/setuptools-49.2.1-py3-none-any.whl and b/Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl differ

diff --git a/Misc/NEWS.d/next/Library/2021-04-24-14-23-07.bpo-43930.R7ah0m.rst b/Misc/NEWS.d/next/Library/2021-04-24-14-23-07.bpo-43930.R7ah0m.rst
new file mode 100644 (file)
index 0000000..7dac21f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-04-24-14-23-07.bpo-43930.R7ah0m.rst
@@ -0,0 +1 @@
+Update bundled pip to 21.1 and setuptools to 56.0.0
\ No newline at end of file