Skip to content

Commit 16bdb17

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "tox: Bump min_version to 4.3.0"
2 parents 94caaa4 + 194f59b commit 16bdb17

File tree

1 file changed

+19
-25
lines changed

1 file changed

+19
-25
lines changed

tox.ini

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
[tox]
2-
minversion = 3.18.0
2+
minversion = 4.3.0
33
envlist = py3,pep8
4-
#skipsdist = True
5-
# Automatic envs (pyXX) will only use the python version appropriate to that
6-
# env and ignore basepython inherited from [testenv] if we set
7-
# ignore_basepython_conflict.
8-
ignore_basepython_conflict = True
94

105
[testenv]
11-
usedevelop = True
12-
basepython = python3
6+
usedevelop = true
137
setenv =
148
OS_STDOUT_CAPTURE=1
159
OS_STDERR_CAPTURE=1
@@ -18,8 +12,8 @@ deps =
1812
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
1913
-r{toxinidir}/test-requirements.txt
2014
-r{toxinidir}/requirements.txt
21-
commands = stestr run {posargs}
22-
allowlist_externals = stestr
15+
commands =
16+
stestr run {posargs}
2317

2418
[testenv:pep8]
2519
deps =
@@ -62,7 +56,6 @@ commands =
6256
pythom -m pip install -q -e "git+file://{toxinidir}/../openstacksdk#egg=openstacksdk"
6357
python -m pip freeze
6458
stestr run {posargs}
65-
allowlist_externals = stestr
6659

6760
[testenv:functional]
6861
setenv =
@@ -87,10 +80,11 @@ commands =
8780

8881
[testenv:venv]
8982
deps =
90-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
91-
-r{toxinidir}/requirements.txt
92-
-r{toxinidir}/doc/requirements.txt
93-
commands = {posargs}
83+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
84+
-r{toxinidir}/requirements.txt
85+
-r{toxinidir}/doc/requirements.txt
86+
commands =
87+
{posargs}
9488

9589
[testenv:cover]
9690
setenv =
@@ -110,23 +104,23 @@ commands =
110104

111105
[testenv:docs]
112106
deps =
113-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
114-
-r{toxinidir}/doc/requirements.txt
107+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
108+
-r{toxinidir}/doc/requirements.txt
115109
commands =
116-
sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
117-
sphinx-build -a -E -W -d doc/build/doctrees -b man doc/source doc/build/man
118-
# Validate redirects (must be done after the docs build
119-
whereto doc/build/html/.htaccess doc/test/redirect-tests.txt
110+
sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
111+
sphinx-build -a -E -W -d doc/build/doctrees -b man doc/source doc/build/man
112+
# Validate redirects (must be done after the docs build
113+
whereto doc/build/html/.htaccess doc/test/redirect-tests.txt
120114

121115
[testenv:releasenotes]
122116
deps =
123-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
124-
-r{toxinidir}/doc/requirements.txt
117+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
118+
-r{toxinidir}/doc/requirements.txt
125119
commands =
126-
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
120+
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
127121

128122
[flake8]
129-
show-source = True
123+
show-source = true
130124
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools,releasenotes
131125
# E203 Black will put spaces after colons in list comprehensions
132126
# E501 Black takes care of line length for us

0 commit comments

Comments
 (0)