]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-132415: Update vendored setuptools in ``Lib/test/wheeldata` (GH-132887...
authorŁukasz Langa <lukasz@langa.pl>
Wed, 11 Jun 2025 15:28:51 +0000 (17:28 +0200)
committerGitHub <noreply@github.com>
Wed, 11 Jun 2025 15:28:51 +0000 (17:28 +0200)
(cherry picked from commit c9f3f5b4ed52d7bed6073ffa39717ece47202558)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Lib/test/support/__init__.py
Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl [deleted file]
Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl [new file with mode: 0644]

index eb971abceb010c6b1c0ca734569dbc4b7690aa9d..ee70407ba83d3f594da453b166a9109bc7498918 100644 (file)
@@ -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 (file)
index 4b7ffd2..0000000
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 (file)
index 0000000..3eb8969
Binary files /dev/null and b/Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl differ