From 76dfc6ff0674199ff5566a7e02a5d2d36db9b5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 5 May 2025 23:22:14 +0200 Subject: [PATCH] [WIP] Tests: Stop requiring wheel.whl in common_wheels --- tests/conftest.py | 7 ------- tests/requirements-common_wheels.txt | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index d093eea462..8e594c4d4e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -449,11 +449,6 @@ def setuptools_install( return _common_wheel_editable_install(tmpdir_factory, common_wheels, "setuptools") -@pytest.fixture(scope="session") -def wheel_install(tmpdir_factory: pytest.TempPathFactory, common_wheels: Path) -> Path: - return _common_wheel_editable_install(tmpdir_factory, common_wheels, "wheel") - - @pytest.fixture(scope="session") def coverage_install( tmpdir_factory: pytest.TempPathFactory, common_wheels: Path @@ -476,7 +471,6 @@ def virtualenv_template( pip_src: Path, pip_editable_parts: Tuple[Path, ...], setuptools_install: Path, - wheel_install: Path, coverage_install: Path, ) -> VirtualEnvironment: venv_type: VirtualEnvironmentType @@ -491,7 +485,6 @@ def virtualenv_template( # Install setuptools, wheel and pip. install_pth_link(venv, "setuptools", setuptools_install) - install_pth_link(venv, "wheel", wheel_install) pth, dist_info = pip_editable_parts diff --git a/tests/requirements-common_wheels.txt b/tests/requirements-common_wheels.txt index 31450a0e86..340abd1f44 100644 --- a/tests/requirements-common_wheels.txt +++ b/tests/requirements-common_wheels.txt @@ -7,7 +7,7 @@ # We pin setuptools<80 because our test suite currently # depends on setup.py develop to generate egg-link files. -setuptools >= 40.8.0, != 60.6.0, <80 -wheel +# We require >= 70.1 to support bdist_wheel without the wheel package +setuptools >= 70.1, <80 # As required by pytest-cov. coverage >= 4.4