From c9f3f5b4ed52d7bed6073ffa39717ece47202558 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Fri, 25 Apr 2025 00:46:20 +0100 Subject: gh-132415: Update vendored setuptools in ``Lib/test/wheeldata`` (#132887) --- Lib/test/support/__init__.py | 14 +++++++------- Lib/test/test_cext/__init__.py | 2 +- Lib/test/test_cppext/__init__.py | 2 +- Lib/test/test_peg_generator/test_c_parser.py | 2 +- Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl | Bin 1089263 -> 0 bytes Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl | Bin 0 -> 1256281 bytes Lib/test/wheeldata/wheel-0.43.0-py3-none-any.whl | Bin 65775 -> 0 bytes 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl create mode 100644 Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl delete mode 100644 Lib/test/wheeldata/wheel-0.43.0-py3-none-any.whl diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 3062ec6..71820a2 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -2416,7 +2416,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 + '-' @@ -2425,16 +2425,16 @@ 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 shlex +def setup_venv_with_pip_setuptools(venv_dir): import subprocess from .os_helper import temp_cwd def run_command(cmd): if verbose: + import shlex print() print('Run:', ' '.join(map(shlex.quote, cmd))) subprocess.run(cmd, check=True) @@ -2458,10 +2458,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')] + ) run_command(cmd) yield python diff --git a/Lib/test/test_cext/__init__.py b/Lib/test/test_cext/__init__.py index 402a2d0..46fde54 100644 --- a/Lib/test/test_cext/__init__.py +++ b/Lib/test/test_cext/__init__.py @@ -53,7 +53,7 @@ class TestExt(unittest.TestCase): def check_build(self, extension_name, std=None, limited=False): venv_dir = 'env' - with support.setup_venv_with_pip_setuptools_wheel(venv_dir) as python_exe: + with support.setup_venv_with_pip_setuptools(venv_dir) as python_exe: self._check_build(extension_name, python_exe, std=std, limited=limited) diff --git a/Lib/test/test_cppext/__init__.py b/Lib/test/test_cppext/__init__.py index 13f9ea1..2b7adac 100644 --- a/Lib/test/test_cppext/__init__.py +++ b/Lib/test/test_cppext/__init__.py @@ -54,7 +54,7 @@ class TestCPPExt(unittest.TestCase): def check_build(self, extension_name, std=None, limited=False): venv_dir = 'env' - with support.setup_venv_with_pip_setuptools_wheel(venv_dir) as python_exe: + with support.setup_venv_with_pip_setuptools(venv_dir) as python_exe: self._check_build(extension_name, python_exe, std=std, limited=limited) diff --git a/Lib/test/test_peg_generator/test_c_parser.py b/Lib/test/test_peg_generator/test_c_parser.py index 1411e55..1095e73 100644 --- a/Lib/test/test_peg_generator/test_c_parser.py +++ b/Lib/test/test_peg_generator/test_c_parser.py @@ -99,7 +99,7 @@ class TestCParser(unittest.TestCase): cls.addClassCleanup(shutil.rmtree, cls.library_dir) with contextlib.ExitStack() as stack: - python_exe = stack.enter_context(support.setup_venv_with_pip_setuptools_wheel("venv")) + python_exe = stack.enter_context(support.setup_venv_with_pip_setuptools("venv")) sitepackages = subprocess.check_output( [python_exe, "-c", "import sysconfig; print(sysconfig.get_path('platlib'))"], text=True, 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 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 index 0000000..3eb8969 Binary files /dev/null and b/Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl differ diff --git a/Lib/test/wheeldata/wheel-0.43.0-py3-none-any.whl b/Lib/test/wheeldata/wheel-0.43.0-py3-none-any.whl deleted file mode 100644 index 67e2308..0000000 Binary files a/Lib/test/wheeldata/wheel-0.43.0-py3-none-any.whl and /dev/null differ -- cgit v0.12