Drop redundant injection of VIRTUAL_ENV

tox automatically injects the environment so no manual override is
necessary.

Also remove basepython because tox uses the python version where tox
is installed by default, and we no longer expect that the tests may run
in env with python 2.

Change-Id: I4082aedf525f8d39dc65236d74e4063d3ae3a1ba
This commit is contained in:
Takashi Kajinami
2025-04-15 21:25:47 +09:00
parent 6c9e65f61b
commit 28464d9b99

26
tox.ini
View File

@@ -1,18 +1,16 @@
[tox] [tox]
envlist = pypy,py39,pep8 envlist = pypy,py39,pep8
ignore_basepython_conflict = true
minversion = 3.18.0 minversion = 3.18.0
[testenv] [testenv]
basepython = python3
setenv = VIRTUAL_ENV={envdir}
usedevelop = True usedevelop = True
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = find . -type f -name "*.py[c|o]" -delete commands =
stestr run --slowest {posargs} find . -type f -name "*.py[c|o]" -delete
stestr run --slowest {posargs}
allowlist_externals = find allowlist_externals = find
[testenv:debug] [testenv:debug]
@@ -36,13 +34,13 @@ passenv = OS_*
[testenv:cover] [testenv:cover]
setenv = setenv =
PYTHON=coverage run --source heatclient --parallel-mode PYTHON=coverage run --source heatclient --parallel-mode
commands = commands =
stestr run {posargs} stestr run {posargs}
coverage combine coverage combine
coverage html -d cover coverage html -d cover
coverage xml -o cover/coverage.xml coverage xml -o cover/coverage.xml
coverage report coverage report
[testenv:docs] [testenv:docs]
deps = deps =