Skip to content

Commit 28464d9

Browse files
committed
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
1 parent 6c9e65f commit 28464d9

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

tox.ini

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
[tox]
22
envlist = pypy,py39,pep8
3-
ignore_basepython_conflict = true
43
minversion = 3.18.0
54

65
[testenv]
7-
basepython = python3
8-
setenv = VIRTUAL_ENV={envdir}
96
usedevelop = True
107
deps =
11-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
12-
-r{toxinidir}/requirements.txt
13-
-r{toxinidir}/test-requirements.txt
14-
commands = find . -type f -name "*.py[c|o]" -delete
15-
stestr run --slowest {posargs}
8+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
9+
-r{toxinidir}/requirements.txt
10+
-r{toxinidir}/test-requirements.txt
11+
commands =
12+
find . -type f -name "*.py[c|o]" -delete
13+
stestr run --slowest {posargs}
1614
allowlist_externals = find
1715

1816
[testenv:debug]
@@ -36,13 +34,13 @@ passenv = OS_*
3634

3735
[testenv:cover]
3836
setenv =
39-
PYTHON=coverage run --source heatclient --parallel-mode
37+
PYTHON=coverage run --source heatclient --parallel-mode
4038
commands =
41-
stestr run {posargs}
42-
coverage combine
43-
coverage html -d cover
44-
coverage xml -o cover/coverage.xml
45-
coverage report
39+
stestr run {posargs}
40+
coverage combine
41+
coverage html -d cover
42+
coverage xml -o cover/coverage.xml
43+
coverage report
4644

4745
[testenv:docs]
4846
deps =

0 commit comments

Comments
 (0)