summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-15 16:38:22 +0000
committerGerrit Code Review <review@openstack.org>2018-10-15 16:38:22 +0000
commitcd3b946233e97a545828e82ef1ada99a224501e0 (patch)
tree1759d2d4f6e1afffb954e255fe344171589c46e3
parente2df001e395dbedee8caee50ee1b67515481708b (diff)
parentba13329fe65eea18047020a1512100125a6a0eb2 (diff)
Merge "fix tox python3 overrides"HEADmaster
-rw-r--r--tox.ini4
1 files changed, 3 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 4d9c7df..24f9f4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,11 +31,12 @@ passenv = http_proxy
31 OS_STDOUT_CAPTURE 31 OS_STDOUT_CAPTURE
32 32
33[testenv:pep8] 33[testenv:pep8]
34basepython = python2.7 34basepython = python3
35commands = sh tools/pretty_flake8.sh 35commands = sh tools/pretty_flake8.sh
36 36
37 37
38[testenv:docs] 38[testenv:docs]
39basepython = python3
39commands = rm -rf doc/build 40commands = rm -rf doc/build
40 sphinx-build -E -W -b html doc/source doc/build/html 41 sphinx-build -E -W -b html doc/source doc/build/html
41 42
@@ -66,6 +67,7 @@ deps = pip-check-reqs
66commands=pip-missing-reqs -d --ignore-file=designate/tests/* designate 67commands=pip-missing-reqs -d --ignore-file=designate/tests/* designate
67 68
68[testenv:venv] 69[testenv:venv]
70basepython = python3
69commands = {posargs} 71commands = {posargs}
70 72
71[flake8] 73[flake8]