Skip to content

Commit 51aac32

Browse files
Fix using deprecated virtualenv option --wheel (#3528)
Co-authored-by: Bernát Gábor <[email protected]> Co-authored-by: Bernát Gábor <[email protected]>
1 parent b770ed5 commit 51aac32

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ dependencies = [
6060
"pyproject-api>=1.8",
6161
"tomli>=2.2.1; python_version<'3.11'",
6262
"typing-extensions>=4.12.2; python_version<'3.11'",
63-
"virtualenv>=20.29.1",
63+
"virtualenv>=20.31",
6464
]
6565
optional-dependencies.test = [
6666
"devpi-process>=1.0.2",

src/tox/pytest.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,8 @@ def our_setup_state(value: Sequence[str]) -> State:
281281
m.setenv("VIRTUALENV_SYMLINK_APP_DATA", "1")
282282
m.setenv("VIRTUALENV_SYMLINKS", "1")
283283
m.setenv("VIRTUALENV_PIP", "embed")
284-
m.setenv("VIRTUALENV_WHEEL", "embed")
284+
if sys.version_info[:2] < (3, 9):
285+
m.setenv("VIRTUALENV_WHEEL", "embed")
285286
m.setenv("VIRTUALENV_SETUPTOOLS", "embed")
286287
try:
287288
tox_run(args)

tests/session/cmd/test_sequential.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ def test_result_json_sequential(
114114
py_test = get_cmd_exit_run_id(log_report, "py", "test")
115115
assert py_test == [(1, "commands[0]"), (0, "commands[1]")]
116116
packaging_installed = log_report["testenvs"]["py"].pop("installed_packages")
117-
expected_pkg = {"pip", "setuptools", "wheel", "a"}
117+
expected_pkg = {"pip", "setuptools", "a"}
118+
if sys.version_info[0:2] == (3, 8):
119+
expected_pkg.add("wheel")
118120
assert {i[: i.find("==")] if "@" not in i else "a" for i in packaging_installed} == expected_pkg
119121
install_package = log_report["testenvs"]["py"].pop("installpkg")
120122
assert re.match(r"^[a-fA-F0-9]{64}$", install_package.pop("sha256"))

0 commit comments

Comments
 (0)