Merge "fix tox python3 overrides"

This commit is contained in:
Zuul 2018-06-07 10:54:42 +00:00 committed by Gerrit Code Review
commit a5cfe50464
1 changed files with 6 additions and 1 deletions

View File

@ -3,7 +3,6 @@ minversion = 2.0
envlist = py35,py27,pypy,pep8 envlist = py35,py27,pypy,pep8
[testenv] [testenv]
basepython = python3
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
whitelist_externals = whitelist_externals =
/bin/sh /bin/sh
@ -17,6 +16,7 @@ commands = python setup.py testr --slowest --testr-args='{posargs}'
basepython = python2.7 basepython = python2.7
[testenv:pep8] [testenv:pep8]
basepython = python3
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = commands =
@ -25,12 +25,15 @@ commands =
bandit -r oslo_privsep -x tests -n5 --skip B404,B603 bandit -r oslo_privsep -x tests -n5 --skip B404,B603
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:docs] [testenv:docs]
basepython = python3
commands = python setup.py build_sphinx commands = python setup.py build_sphinx
[testenv:cover] [testenv:cover]
basepython = python3
commands = python setup.py testr --coverage --testr-args='{posargs}' commands = python setup.py testr --coverage --testr-args='{posargs}'
[flake8] [flake8]
@ -49,9 +52,11 @@ import_exceptions =
oslo_privsep._i18n oslo_privsep._i18n
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[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