00460: pythongh-132415: Update vendored setuptools in Lib/test/wheeldata

(cherry picked from commit c9f3f5b)
(actual changes in .whl files removed to make this patch smaller)

pythongh-127906: Add missing sys import to test_cppext

(cherry picked from commit 9cba148)

Co-Authored-By: Victor Stinner <vstinner@python.org>

Author: 2 people

Lib/test/support/__init__.py

@@ -2308,7 +2308,7 @@ def _findwheel(pkgname):
 # 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):
+def setup_venv_with_pip_setuptools(venv_dir):
     import subprocess
     from .os_helper import temp_cwd
 
@@ -2331,8 +2331,7 @@ def setup_venv_with_pip_setuptools_wheel(venv_dir):
 
         cmd = (python, '-X', 'dev',
                '-m', 'pip', 'install',
-               _findwheel('setuptools'),
-               _findwheel('wheel'))
+               _findwheel('setuptools'))
         if verbose:
             print()
             print('Run:', ' '.join(cmd))

Lib/test/test_cext/__init__.py

@@ -53,7 +53,7 @@ def check_build(self, extension_name, std=None, limited=False):
             self.skipTest('Py_LIMITED_API is incompatible with Py_TRACE_REFS')
 
         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)
 

Lib/test/test_cppext/__init__.py

@@ -51,7 +51,7 @@ def check_build(self, extension_name, std=None, limited=False):
             self.skipTest('Py_LIMITED_API is incompatible with Py_TRACE_REFS')
 
         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)
 

Lib/test/test_cppext/setup.py

@@ -3,6 +3,7 @@
 import os
 import platform
 import shlex
+import sys
 import sysconfig
 from test import support
 

Lib/test/test_peg_generator/test_c_parser.py

@@ -99,7 +99,7 @@ def setUpClass(cls):
         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,