Skip to content

Commit 68016f0

Browse files
authored
Merge pull request #13841 from bluetech/tox-cleanups
Some tox cleanups
2 parents fd7742e + 0ed35d5 commit 68016f0

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

changelog/13841.contrib.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
``tox>=4`` is now required when contributing to pytest.

tox.ini

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[tox]
2-
isolated_build = True
3-
minversion = 3.20.0
4-
distshare = {homedir}/.tox/distshare
2+
requires =
3+
tox >= 4
54
envlist =
65
linting
76
py310
@@ -94,12 +93,14 @@ deps =
9493
xdist: pytest-xdist>=2.1.0
9594
xdist: -e .
9695
{env:_PYTEST_TOX_EXTRA_DEP:}
96+
# Can use the same wheel for all environments.
97+
package = wheel
98+
wheel_build_env = .pkg
9799

98100
[testenv:linting]
99101
description =
100102
run pre-commit-defined linters under `{basepython}`
101103
skip_install = True
102-
basepython = python3
103104
deps = pre-commit>=2.9.3
104105
commands = pre-commit run --all-files --show-diff-on-failure {posargs:}
105106
setenv =
@@ -127,7 +128,6 @@ setenv =
127128
[testenv:docs-checklinks]
128129
description =
129130
check the links in the documentation with `{basepython}`
130-
basepython = python3
131131
usedevelop = True
132132
changedir = doc/en
133133
deps = -r{toxinidir}/doc/en/requirements.txt
@@ -141,7 +141,6 @@ setenv =
141141
description =
142142
regenerate documentation examples under `{basepython}`
143143
changedir = doc/en
144-
basepython = python3
145144
passenv =
146145
SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PYTEST
147146
deps =
@@ -194,7 +193,6 @@ commands =
194193

195194
[testenv:release]
196195
description = do a release, required posarg of the version number
197-
basepython = python3
198196
usedevelop = True
199197
passenv = *
200198
deps =
@@ -212,7 +210,6 @@ commands = python scripts/prepare-release-pr.py {posargs}
212210

213211
[testenv:generate-gh-release-notes]
214212
description = generate release notes that can be published as GitHub Release
215-
basepython = python3
216213
usedevelop = True
217214
deps =
218215
pypandoc

0 commit comments

Comments
 (0)