summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhuang.zhiping <huang.zhiping@99cloud.net>2018-06-09 09:21:21 +0800
committerhuang.zhiping <huang.zhiping@99cloud.net>2018-06-09 09:22:23 +0800
commit86f514e9ccf3200df94ac26a30b57ad109415b38 (patch)
tree163389f4b9f69314cb4fd3cff12b47132d7c3369
parent6201296d61d592fd640a9e272ee62688ea43a85a (diff)
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: Ie14819fe7be1fc6d7d8e04f2aa9f123bb6ad17e6
Notes
Notes (review): Code-Review+2: chenying <chenyingko@gmail.com> Code-Review+1: Filippo Inzaghi <zhao.daqing@99cloud.net> Workflow+1: chenying <chenyingko@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 31 Jul 2018 02:02:14 +0000 Reviewed-on: https://review.openstack.org/573859 Project: openstack/karbor-dashboard Branch: refs/heads/master
-rw-r--r--tox.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 9f9add7..60c7d0e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,14 +20,17 @@ deps = -r{toxinidir}/requirements.txt
20commands = {toxinidir}/manage.py test karbor_dashboard --settings=karbor_dashboard.test.settings 20commands = {toxinidir}/manage.py test karbor_dashboard --settings=karbor_dashboard.test.settings
21 21
22[testenv:pep8] 22[testenv:pep8]
23basepython = python3
23commands = 24commands =
24 /bin/bash run_tests.sh -N --pep8 25 /bin/bash run_tests.sh -N --pep8
25 /bin/bash run_tests.sh -N --makemessages --check-only 26 /bin/bash run_tests.sh -N --makemessages --check-only
26 27
27[testenv:venv] 28[testenv:venv]
29basepython = python3
28commands = {posargs} 30commands = {posargs}
29 31
30[testenv:cover] 32[testenv:cover]
33basepython = python3
31commands = /bin/bash run_tests.sh -N --no-pep8 --coverage {posargs} 34commands = /bin/bash run_tests.sh -N --no-pep8 --coverage {posargs}
32 35
33[testenv:py27dj18] 36[testenv:py27dj18]
@@ -40,12 +43,14 @@ basepython = python2.7
40commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs} 43commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}
41 44
42[testenv:eslint] 45[testenv:eslint]
46basepython = python3
43passenv = * 47passenv = *
44commands = nodeenv -p 48commands = nodeenv -p
45 npm install 49 npm install
46 /bin/bash run_tests.sh -N --eslint 50 /bin/bash run_tests.sh -N --eslint
47 51
48[testenv:docs] 52[testenv:docs]
53basepython = python3
49setenv = DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings 54setenv = DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings
50commands = python setup.py build_sphinx 55commands = python setup.py build_sphinx
51 56