Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820)" (GH-31881)

This reverts commit bda64b3c0c4e45de4c82ba1b8722f56db5ac88ba
as it breaks test_bdb and test_distutils with installed Pythons.

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 0d76fc9b4aac2f17e0bcc15956df3f3af70930b6..e510cc7fb2bafdb158d690e07fb7b7dd4ea297e3 100644 (file)
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -11,8 +11,7 @@ from . import _bundled
 
 
 __all__ = ["version", "bootstrap"]
-_PACKAGE_NAMES = ('setuptools', 'pip')
-_SETUPTOOLS_VERSION = "60.9.3"
+_SETUPTOOLS_VERSION = "58.1.0"
 _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
new file mode 100644 (file)
index 0000000..18c8c22
Binary files /dev/null and b/Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl 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
deleted file mode 100644 (file)
index b88ddc6..0000000
Binary files a/Lib/ensurepip/_bundled/setuptools-60.9.3-py3-none-any.whl and /dev/null 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
deleted file mode 100644 (file)
index 06dd127..0000000
--- a/Misc/NEWS.d/next/Library/2022-03-11-13-54-27.bpo-46986.nF1meI.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade setuptools wheel bundled with ensurepip (setuptools 60.9.3)