summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-09-29 18:11:45 +0000
committerGerrit Code Review <review@openstack.org>2018-09-29 18:11:45 +0000
commitc9d59c82c2308ed39ba76c17e89a508943cff3a4 (patch)
tree22ab0043bf124e083c59d6e7b4e0da3ce76b6b47
parentf0a948cf6085e2d900813f1d3feef59cb922659e (diff)
parent478249c85b9ed05d01c1a6201fb3f69024ff4216 (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 b1a2cfb..4b03072 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,7 @@ setenv =
33 33
34 34
35[testenv:docs] 35[testenv:docs]
36basepython = python3
36deps = -r{toxinidir}/doc/requirements.txt 37deps = -r{toxinidir}/doc/requirements.txt
37commands= 38commands=
38 bash -c "rm -rf doc/build" 39 bash -c "rm -rf doc/build"
@@ -46,6 +47,7 @@ extensions = .rst
46 47
47 48
48[testenv:releasenotes] 49[testenv:releasenotes]
50basepython = python3
49deps = -r{toxinidir}/doc/requirements.txt 51deps = -r{toxinidir}/doc/requirements.txt
50commands = 52commands =
51 sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html 53 sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
@@ -53,11 +55,13 @@ commands =
53 55
54# environment used by the -infra templated docs job 56# environment used by the -infra templated docs job
55[testenv:venv] 57[testenv:venv]
58basepython = python3
56commands = 59commands =
57 {posargs} 60 {posargs}
58 61
59 62
60[testenv:pep8] 63[testenv:pep8]
64basepython = python3
61commands = 65commands =
62 bash -c "{toxinidir}/tests/common/test-pep8.sh" 66 bash -c "{toxinidir}/tests/common/test-pep8.sh"
63 67
@@ -91,6 +95,7 @@ commands =
91 95
92 96
93[testenv:linters] 97[testenv:linters]
98basepython = python3
94commands = 99commands =
95 bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh" 100 bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
96 {[testenv:pep8]commands} 101 {[testenv:pep8]commands}