From 19f69993ae97db0bbea3b845a33b060b73b658b3 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 14 Mar 2022 16:30:46 -0400 Subject: Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820)" (GH-31879) This reverts commit c99ac3c364ee21be72263791b71ee8b55f64de08 as it breaks test_bdb and test_distutils with installed Pythons. --- Lib/ensurepip/__init__.py | 2 +- .../_bundled/setuptools-58.1.0-py3-none-any.whl | Bin 0 -> 816725 bytes .../_bundled/setuptools-60.9.3-py3-none-any.whl | Bin 1078952 -> 0 bytes .../Library/2022-03-11-13-54-27.bpo-46986.nF1meI.rst | 1 - 4 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl delete mode 100644 Lib/ensurepip/_bundled/setuptools-60.9.3-py3-none-any.whl delete mode 100644 Misc/NEWS.d/next/Library/2022-03-11-13-54-27.bpo-46986.nF1meI.rst diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index d23fcad..a198a86 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -10,7 +10,7 @@ from importlib import resources __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 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 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 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) -- cgit v0.12