Skip to content

Commit 033aa5c

Browse files
ambvAA-Turner
andauthored
[3.12] gh-132415: Update vendored setuptools in `Lib/test/wheeldata (GH-132887) (GH-135393)
(cherry picked from commit c9f3f5b) Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
1 parent d43cb4f commit 033aa5c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Lib/test/support/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,7 +2261,7 @@ def _findwheel(pkgname):
22612261
filenames = os.listdir(wheel_dir)
22622262
filenames = sorted(filenames, reverse=True) # approximate "newest" first
22632263
for filename in filenames:
2264-
# filename is like 'setuptools-67.6.1-py3-none-any.whl'
2264+
# filename is like 'setuptools-{version}-py3-none-any.whl'
22652265
if not filename.endswith(".whl"):
22662266
continue
22672267
prefix = pkgname + '-'
@@ -2270,8 +2270,8 @@ def _findwheel(pkgname):
22702270
raise FileNotFoundError(f"No wheel for {pkgname} found in {wheel_dir}")
22712271

22722272

2273-
# Context manager that creates a virtual environment, install setuptools and wheel in it
2274-
# and returns the path to the venv directory and the path to the python executable
2273+
# Context manager that creates a virtual environment, install setuptools in it,
2274+
# and returns the paths to the venv directory and the python executable
22752275
@contextlib.contextmanager
22762276
def setup_venv_with_pip_setuptools_wheel(venv_dir):
22772277
import subprocess
@@ -2294,10 +2294,10 @@ def setup_venv_with_pip_setuptools_wheel(venv_dir):
22942294
else:
22952295
python = os.path.join(venv, 'bin', python_exe)
22962296

2297-
cmd = [python, '-X', 'dev',
2297+
cmd = (python, '-X', 'dev',
22982298
'-m', 'pip', 'install',
22992299
_findwheel('setuptools'),
2300-
_findwheel('wheel')]
2300+
_findwheel('wheel'))
23012301
if verbose:
23022302
print()
23032303
print('Run:', ' '.join(cmd))
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)