Skip to content
Snippets Groups Projects
Commit 9bc12e66 authored by qingszhao's avatar qingszhao
Browse files

fix tox python3 overrides

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: Ie0eca8c8627ab67c7c4aeccdc8607e36a259f13c
parent 1b83b4e4
No related branches found
No related tags found
No related merge requests found
...@@ -20,9 +20,11 @@ commands = ...@@ -20,9 +20,11 @@ commands =
python setup.py test --slowest --testr-args='{posargs}' python setup.py test --slowest --testr-args='{posargs}'
[testenv:debug] [testenv:debug]
basepython = python3
commands = oslo_debug_helper -t tests {posargs} commands = oslo_debug_helper -t tests {posargs}
[testenv:cover] [testenv:cover]
basepython = python3
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
NOSE_WITH_COVERAGE=1 NOSE_WITH_COVERAGE=1
NOSE_COVER_BRANCHES=1 NOSE_COVER_BRANCHES=1
...@@ -31,6 +33,7 @@ setenv = VIRTUAL_ENV={envdir} ...@@ -31,6 +33,7 @@ setenv = VIRTUAL_ENV={envdir}
commands = python setup.py testr --coverage --testr-args='{posargs}' commands = python setup.py testr --coverage --testr-args='{posargs}'
[testenv:pep8] [testenv:pep8]
basepython = python3
# sphinx needs to be installed to make doc8 work properly # sphinx needs to be installed to make doc8 work properly
deps = deps =
{[testenv]deps} {[testenv]deps}
...@@ -45,9 +48,11 @@ commands = ...@@ -45,9 +48,11 @@ commands =
yamllint . yamllint .
[testenv:bandit] [testenv:bandit]
basepython = python3
commands = bandit -r ansible kolla_ansible tests tools commands = bandit -r ansible kolla_ansible tests tools
[testenv:venv] [testenv:venv]
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}/test-requirements.txt -r{toxinidir}/test-requirements.txt
...@@ -55,6 +60,7 @@ deps = ...@@ -55,6 +60,7 @@ deps =
commands = {posargs} commands = {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
...@@ -64,6 +70,7 @@ commands = ...@@ -64,6 +70,7 @@ commands =
sphinx-build -W -b html doc/source doc/build/html sphinx-build -W -b html doc/source doc/build/html
[testenv:deploy-guide] [testenv:deploy-guide]
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
...@@ -74,11 +81,13 @@ commands = ...@@ -74,11 +81,13 @@ commands =
sphinx-build -a -E -W -d deploy-guide/build/doctrees -b html deploy-guide/source deploy-guide/build/html sphinx-build -a -E -W -d deploy-guide/build/doctrees -b html deploy-guide/source deploy-guide/build/html
[testenv:setupenv] [testenv:setupenv]
basepython = python3
commands = commands =
{toxinidir}/tools/setup_gate.sh {toxinidir}/tools/setup_gate.sh
{toxinidir}/tools/dump_info.sh {toxinidir}/tools/dump_info.sh
[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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment