bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820) (GH-31855)

(cherry picked from commit c99ac3c364ee21be72263791b71ee8b55f64de08)

Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index e510cc7fb2bafdb158d690e07fb7b7dd4ea297e3..0d76fc9b4aac2f17e0bcc15956df3f3af70930b6 100644 (file)
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -11,7 +11,8 @@ from . import _bundled
 
 
 __all__ = ["version", "bootstrap"]
-_SETUPTOOLS_VERSION = "58.1.0"
+_PACKAGE_NAMES = ('setuptools', 'pip')
+_SETUPTOOLS_VERSION = "60.9.3"
 _PIP_VERSION = "22.0.4"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),

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

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

diff --git a/Misc/NEWS.d/next/Library/2022-03-11-13-54-27.bpo-46986.nF1meI.rst b/Misc/NEWS.d/next/Library/2022-03-11-13-54-27.bpo-46986.nF1meI.rst
new file mode 100644 (file)
index 0000000..06dd127
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-03-11-13-54-27.bpo-46986.nF1meI.rst
@@ -0,0 +1 @@
+Upgrade setuptools wheel bundled with ensurepip (setuptools 60.9.3)