performa/os-faults
Code Issues Proposed changes

fix tox python3 overrides

Browse Source 
We want to default to running all tox environments under python 3, so
set the basepython value in each environment.

We do not want to specify a minor version number, because we do not
want to have to update the file every time we upgrade python.

We do not want to set the override once in testenv, because that
breaks the more specific versions used in default environments like
py35 and py36.

Change-Id: Ie0fd5165d9b65ec1fc443ad08eaf7b708bfe73d4
This commit is contained in:
huang.zhiping 2018-06-09 19:07:40 +08:00
parent d47e3cdd8a
commit 11e2f8a7e2
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tox.ini
View File

@ -24,29 +24,36 @@ commands =
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
[testenv:common-constraints] [testenv:common-constraints]
basepython = python3
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = flake8 . doc/ext commands = flake8 . doc/ext
[testenv:pep8-constraints] [testenv:pep8-constraints]
basepython = python3
install_command = {[testenv:common-constraints]install_command} install_command = {[testenv:common-constraints]install_command}
commands = {[testenv:pep8]commands} commands = {[testenv:pep8]commands}
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:venv-constraints] [testenv:venv-constraints]
basepython = python3
install_command = {[testenv:common-constraints]install_command} install_command = {[testenv:common-constraints]install_command}
commands = {posargs} commands = {posargs}
[testenv:cover] [testenv:cover]
basepython = python3
commands = commands =
py.test --cov-config .coveragerc --cov-report html --cov=os_faults "os_faults/tests/unit" py.test --cov-config .coveragerc --cov-report html --cov=os_faults "os_faults/tests/unit"
coverage html -d {envlogdir} coverage html -d {envlogdir}
coverage report coverage report
[testenv:cover-constraints] [testenv:cover-constraints]
basepython = python3
install_command = {[testenv:common-constraints]install_command} install_command = {[testenv:common-constraints]install_command}
commands = {[testenv:cover]commands} commands = {[testenv:cover]commands}
@ -71,22 +78,27 @@ deps = {[testenv:integration]deps}
commands = {[testenv:integration]commands} commands = {[testenv:integration]commands}
[testenv:docs] [testenv:docs]
basepython = python3
commands = commands =
rm -rf doc/build rm -rf doc/build
python setup.py build_sphinx --warning-is-error python setup.py build_sphinx --warning-is-error
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
commands = commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:docs-constraints] [testenv:docs-constraints]
basepython = python3
install_command = {[testenv:common-constraints]install_command} install_command = {[testenv:common-constraints]install_command}
commands = {[testenv:docs]commands} commands = {[testenv:docs]commands}
[testenv:debug] [testenv:debug]
basepython = python3
commands = oslo_debug_helper {posargs} commands = oslo_debug_helper {posargs}
[testenv:debug-constraints] [testenv:debug-constraints]
basepython = python3
install_command = {[testenv:common-constraints]install_command} install_command = {[testenv:common-constraints]install_command}
commands = {[testenv:debug]commands} commands = {[testenv:debug]commands}