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

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

This reverts commit 0fbab8a593dcd94cfc788700dd9bf67a73f85920
as it breaks test_bdb and test_distutils with installed Pythons.
---

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 3d88dec2cdf4..8289c495d368 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,7 +8,7 @@ import tempfile
 
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
-_SETUPTOOLS_VERSION = "60.9.3"
+_SETUPTOOLS_VERSION = "47.1.0"
 _PIP_VERSION = "22.0.4"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/setuptools-47.1.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-47.1.0-py3-none-any.whl
new file mode 100644
index 000000000000..f87867ff9825
Binary files /dev/null and b/Lib/ensurepip/_bundled/setuptools-47.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)