From: Ned Deily <nad@python.org>
Date: Mon, 14 Mar 2022 21:10:20 +0000 (-0400)
Subject: Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820)" (GH-31881)
X-Git-Tag: v3.9.11~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b1239205d1b7ace1b054477c14fe77d54f471c4;p=thirdparty%2FPython%2Fcpython.git

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 0d76fc9b4aac..e510cc7fb2ba 100644
--- 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
index 000000000000..18c8c22958f1
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
index b88ddc659ee1..000000000000
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
index 06dd1271902d..000000000000
--- 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)