summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-31 02:02:14 +0000
committerGerrit Code Review <review@openstack.org>2018-07-31 02:02:14 +0000
commit8d5c5fa8254df3cd9f9b5574473dbe02c0146e6b (patch)
tree37190450ca098d7577f912cb5d2c46073985b2eb
parent8c851fce3914cdc3b190eb60f418f2b5ccf0bcea (diff)
parent86f514e9ccf3200df94ac26a30b57ad109415b38 (diff)
Merge "fix tox python3 overrides"
-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