https://github.com/python/cpython/commit/033aa5cfd856e52d5b10fc765631c16b308ee4f1
commit: 033aa5cfd856e52d5b10fc765631c16b308ee4f1
branch: 3.12
author: Łukasz Langa <luk...@langa.pl>
committer: ambv <luk...@langa.pl>
date: 2025-06-11T17:28:51+02:00
summary:
[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-tur...@users.noreply.github.com>
files:
A Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl
D Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl
M Lib/test/support/__init__.py
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index eb971abceb010c..ee70407ba83d3f 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 4b7ffd2e49e155..00000000000000
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 00000000000000..3eb896915897fb
Binary files /dev/null and
b/Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl differ
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: arch...@mail-archive.com
