tox: Trivial cleanup

Move 'basepython' to the top-level 'testenv'.

Change-Id: I4957925d96c2eea0f9a2d791feb71b6d3f54a224
This commit is contained in:
Hervé Beraud 2019-12-20 10:46:17 +01:00
parent e3e2ba55ee
commit db72309ae8

14
tox.ini
View File

@ -1,9 +1,11 @@
[tox] [tox]
minversion = 2.0 minversion = 3.1
distribute = False distribute = False
envlist = py27,py37,pep8 envlist = py27,py37,pep8
ignore_basepython_conflict = True
[testenv] [testenv]
basepython = python3
whitelist_externals = whitelist_externals =
find find
setenv = setenv =
@ -21,25 +23,19 @@ commands =
stestr slowest stestr slowest
[testenv:lower-constraints] [testenv:lower-constraints]
basepython = python3
deps = deps =
-c{toxinidir}/lower-constraints.txt -c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
[testenv:py27]
basepython = python2.7
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = commands =
flake8 flake8
# Run security linter # Run security linter
bandit -r oslo_config -x tests -n5 bandit -r oslo_config -x tests -n5
[testenv:cover] [testenv:cover]
basepython = python3
setenv = setenv =
PYTHON=coverage run --source oslo_config --parallel-mode PYTHON=coverage run --source oslo_config --parallel-mode
commands = commands =
@ -51,11 +47,9 @@ commands =
coverage report --show-missing coverage report --show-missing
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:docs] [testenv:docs]
basepython = python3
whitelist_externals = rm whitelist_externals = rm
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
commands = commands =
@ -63,7 +57,6 @@ commands =
sphinx-build -W --keep-going -b html doc/source doc/build/html {posargs} sphinx-build -W --keep-going -b html doc/source doc/build/html {posargs}
[testenv:bandit] [testenv:bandit]
basepython = python3
commands = bandit -r oslo_config -x tests -n5 commands = bandit -r oslo_config -x tests -n5
[flake8] [flake8]
@ -72,7 +65,6 @@ enable-extensions = H203,H106
exclude = .tox,dist,doc,*.egg,build exclude = .tox,dist,doc,*.egg,build
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
commands = commands =
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