Merge "trivial: Cleanup tox.ini"

This commit is contained in:
Zuul 2020-02-13 12:33:30 +00:00 committed by Gerrit Code Review
commit f1294c73a4
1 changed files with 5 additions and 6 deletions

11
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 3.1 minversion = 3.2.0
envlist = py37,pypy,pep8 envlist = py37,pep8
ignore_basepython_conflict = True ignore_basepython_conflict = True
[testenv] [testenv]
@ -21,8 +21,7 @@ commands =
{toxinidir}/tools/setup-etcd-env.sh pifpaf -e OSLO_CACHE_TEST run etcd -- stestr run --slowest functional.* {toxinidir}/tools/setup-etcd-env.sh pifpaf -e OSLO_CACHE_TEST run etcd -- stestr run --slowest functional.*
[testenv:pep8] [testenv:pep8]
deps = deps = {[testenv]deps}
-r{toxinidir}/test-requirements.txt
commands = commands =
flake8 flake8
# Run security linter # Run security linter
@ -34,7 +33,7 @@ commands = {posargs}
[testenv:docs] [testenv:docs]
whitelist_externals = rm whitelist_externals = rm
deps = deps =
{[testenv]deps} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
rm -fr doc/build rm -fr doc/build
@ -61,7 +60,7 @@ import_exceptions =
[testenv:releasenotes] [testenv:releasenotes]
whitelist_externals = whitelist_externals =
rm rm
deps = -r{toxinidir}/doc/requirements.txt deps = {[testenv:docs]deps}
commands = commands =
rm -rf releasenotes/build rm -rf releasenotes/build
sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html