Skip to content

Commit 020c474

Browse files
committed
Fixes for tox 4.0
- passenv needed better structure - usedevelop no longer allowed alongside skipsdist Change-Id: I22dae3b1e4cca2dc328c21e889acf7fe98a80e0b
1 parent 3e2fef8 commit 020c474

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

tox.ini

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
[tox]
22
minversion = 3.18.0
3-
skipsdist = True
43
envlist = py3,functional,pep8
54
ignore_basepython_conflict=true
65

76
[testenv]
8-
usedevelop = True
97
basepython = python3
108
setenv =
119
VIRTUAL_ENV={envdir}
@@ -19,7 +17,13 @@ deps =
1917
-r{toxinidir}/requirements.txt
2018
-r{toxinidir}/test-requirements.txt
2119
commands = stestr run {posargs}
22-
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
20+
passenv =
21+
http_proxy
22+
HTTP_PROXY
23+
https_proxy
24+
HTTPS_PROXY
25+
no_proxy
26+
NO_PROXY
2327

2428
[testenv:functional]
2529
# Define virtualenv directory, port to use for functional testing, and number
@@ -33,8 +37,7 @@ setenv =
3337
commands = stestr run {posargs}
3438

3539
[testenv:pep8]
36-
usedevelop = False
37-
deps=
40+
deps =
3841
hacking>=4.1.0,<5.0.0 # Apache-2.0
3942
bashate>=0.5.1 # Apache-2.0
4043
flake8-import-order>=0.17.1 # LGPLv3
@@ -87,7 +90,6 @@ commands =
8790
make -C doc/build/pdf
8891

8992
[testenv:releasenotes]
90-
usedevelop = False
9193
deps =
9294
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
9395
-r{toxinidir}/doc/requirements.txt
@@ -126,7 +128,6 @@ commands =
126128
oslo-config-generator --config-file=tools/config/ipa-config-generator.conf
127129

128130
[testenv:bandit]
129-
usedevelop = False
130131
deps =
131132
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
132133
-r{toxinidir}/test-requirements.txt

0 commit comments

Comments
 (0)