Skip to content

Tests: Stop requiring wheel.whl in common_wheels #13382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hroncok wants to merge 1 commit into from
Closed

Tests: Stop requiring wheel.whl in common_wheels #13382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions tests/requirements-common_wheels.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading