Merge "fix tox python3 overrides"

This commit is contained in:
Zuul 2018-06-25 00:46:21 +00:00 committed by Gerrit Code Review
commit 571e4415c9

View File

@ -18,6 +18,7 @@ commands =
whitelist_externals = find whitelist_externals = find
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = commands =
flake8 flake8
# Check that .po and .pot files are valid: # Check that .po and .pot files are valid:
@ -25,6 +26,7 @@ commands =
whitelist_externals = bash whitelist_externals = bash
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:functional] [testenv:functional]
@ -34,14 +36,17 @@ setenv =
passenv = OS_* passenv = OS_*
[testenv:cover] [testenv:cover]
basepython = python3
commands = commands =
python setup.py testr --coverage --testr-args='{posargs}' python setup.py testr --coverage --testr-args='{posargs}'
coverage report coverage report
[testenv:debug] [testenv:debug]
basepython = python3
commands = oslo_debug_helper -t senlinclient/tests {posargs} commands = oslo_debug_helper -t senlinclient/tests {posargs}
[testenv:docs] [testenv:docs]
basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
@ -49,6 +54,7 @@ deps =
commands = sphinx-build -W -b html doc/source doc/build/html commands = sphinx-build -W -b html doc/source doc/build/html
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt