[3.9] Upgrade bundled pip and setuptools (GH-27625) (GH-27658)

pip is now 21.2.3
setuptools is now 57.4.0.
(cherry picked from commit 738ac00a08cb6a9d104ec85ccb1a44c2399d6baa)

Co-authored-by: Tzu-ping Chung <uranusjr@gmail.com>

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 14a39037e0c7717edd0530ecb9d382d8e72aef8b..7b03970c93ec077656f98ddb319876bf08b162fd 100644 (file)
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -13,9 +13,9 @@ from . import _bundled
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "56.0.0"
+_SETUPTOOLS_VERSION = "57.4.0"
 
-_PIP_VERSION = "21.1.3"
+_PIP_VERSION = "21.2.3"
 
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),

diff --git a/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl
deleted file mode 100644 (file)
index d96a40a..0000000
Binary files a/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl and /dev/null differ

diff --git a/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
new file mode 100644 (file)
index 0000000..d417df6
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl differ

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

diff --git a/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst b/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
new file mode 100644 (file)
index 0000000..99f0806
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
@@ -0,0 +1 @@
+Upgrade bundled pip to 21.2.3 and setuptools to 57.4.0\r