From: Łukasz Langa <lukasz@langa.pl>
Date: Wed, 11 Jun 2025 15:28:51 +0000 (+0200)
Subject: [3.12] gh-132415: Update vendored setuptools in ``Lib/test/wheeldata` (GH-132887... 
X-Git-Tag: v3.12.12~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=033aa5cfd856e52d5b10fc765631c16b308ee4f1;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-132415: Update vendored setuptools in ``Lib/test/wheeldata` (GH-132887) (GH-135393)

(cherry picked from commit c9f3f5b4ed52d7bed6073ffa39717ece47202558)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
---

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index eb971abceb01..ee70407ba83d 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2261,7 +2261,7 @@ def _findwheel(pkgname):
     filenames = os.listdir(wheel_dir)
     filenames = sorted(filenames, reverse=True)  # approximate "newest" first
     for filename in filenames:
-        # filename is like 'setuptools-67.6.1-py3-none-any.whl'
+        # filename is like 'setuptools-{version}-py3-none-any.whl'
         if not filename.endswith(".whl"):
             continue
         prefix = pkgname + '-'
@@ -2270,8 +2270,8 @@ def _findwheel(pkgname):
     raise FileNotFoundError(f"No wheel for {pkgname} found in {wheel_dir}")
 
 
-# Context manager that creates a virtual environment, install setuptools and wheel in it
-# and returns the path to the venv directory and the path to the python executable
+# Context manager that creates a virtual environment, install setuptools in it,
+# and returns the paths to the venv directory and the python executable
 @contextlib.contextmanager
 def setup_venv_with_pip_setuptools_wheel(venv_dir):
     import subprocess
@@ -2294,10 +2294,10 @@ def setup_venv_with_pip_setuptools_wheel(venv_dir):
         else:
             python = os.path.join(venv, 'bin', python_exe)
 
-        cmd = [python, '-X', 'dev',
+        cmd = (python, '-X', 'dev',
                '-m', 'pip', 'install',
                _findwheel('setuptools'),
-               _findwheel('wheel')]
+               _findwheel('wheel'))
         if verbose:
             print()
             print('Run:', ' '.join(cmd))
diff --git a/Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl b/Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl
deleted file mode 100644
index 4b7ffd2e49e1..000000000000
Binary files a/Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl and /dev/null differ
diff --git a/Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl b/Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl
new file mode 100644
index 000000000000..3eb896915897
Binary files /dev/null and b/Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl differ