Skip to content

Commit 44ae3b2

Browse files
committed
gh-132866: Update setuptools.whl in test.wheeldata to 70.3.0, drop wheel.whl
70.3.0 is still reasonable small, newer versions grown in size.
1 parent 5808889 commit 44ae3b2

File tree

8 files changed

+9
-8
lines changed

8 files changed

+9
-8
lines changed

Lib/test/support/__init__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2416,7 +2416,7 @@ def _findwheel(pkgname):
24162416
filenames = os.listdir(wheel_dir)
24172417
filenames = sorted(filenames, reverse=True) # approximate "newest" first
24182418
for filename in filenames:
2419-
# filename is like 'setuptools-67.6.1-py3-none-any.whl'
2419+
# filename is like 'setuptools-70.3.0-py3-none-any.whl'
24202420
if not filename.endswith(".whl"):
24212421
continue
24222422
prefix = pkgname + '-'
@@ -2425,10 +2425,10 @@ def _findwheel(pkgname):
24252425
raise FileNotFoundError(f"No wheel for {pkgname} found in {wheel_dir}")
24262426

24272427

2428-
# Context manager that creates a virtual environment, install setuptools and wheel in it
2428+
# Context manager that creates a virtual environment, install setuptools in it
24292429
# and returns the path to the venv directory and the path to the python executable
24302430
@contextlib.contextmanager
2431-
def setup_venv_with_pip_setuptools_wheel(venv_dir):
2431+
def setup_venv_with_pip_setuptools(venv_dir):
24322432
import shlex
24332433
import subprocess
24342434
from .os_helper import temp_cwd
@@ -2460,8 +2460,7 @@ def run_command(cmd):
24602460

24612461
cmd = [python, '-X', 'dev',
24622462
'-m', 'pip', 'install',
2463-
_findwheel('setuptools'),
2464-
_findwheel('wheel')]
2463+
_findwheel('setuptools')]
24652464
run_command(cmd)
24662465

24672466
yield python

Lib/test/test_cext/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def test_build_limited_c11(self):
5353

5454
def check_build(self, extension_name, std=None, limited=False):
5555
venv_dir = 'env'
56-
with support.setup_venv_with_pip_setuptools_wheel(venv_dir) as python_exe:
56+
with support.setup_venv_with_pip_setuptools(venv_dir) as python_exe:
5757
self._check_build(extension_name, python_exe,
5858
std=std, limited=limited)
5959

Lib/test/test_cppext/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_build_limited(self):
5454

5555
def check_build(self, extension_name, std=None, limited=False):
5656
venv_dir = 'env'
57-
with support.setup_venv_with_pip_setuptools_wheel(venv_dir) as python_exe:
57+
with support.setup_venv_with_pip_setuptools(venv_dir) as python_exe:
5858
self._check_build(extension_name, python_exe,
5959
std=std, limited=limited)
6060

Lib/test/test_peg_generator/test_c_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def setUpClass(cls):
9999
cls.addClassCleanup(shutil.rmtree, cls.library_dir)
100100

101101
with contextlib.ExitStack() as stack:
102-
python_exe = stack.enter_context(support.setup_venv_with_pip_setuptools_wheel("venv"))
102+
python_exe = stack.enter_context(support.setup_venv_with_pip_setuptools("venv"))
103103
sitepackages = subprocess.check_output(
104104
[python_exe, "-c", "import sysconfig; print(sysconfig.get_path('platlib'))"],
105105
text=True,
-1.04 MB
Binary file not shown.
909 KB
Binary file not shown.
-64.2 KB
Binary file not shown.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Updated the setuptools.whl used in tests to 70.3.0, in order to drop the
2+
wheel.whl.

0 commit comments

Comments
 (0)