summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-06 17:32:00 +0000
committerGerrit Code Review <review@openstack.org>2019-02-06 17:32:00 +0000
commit73d7745e1050b496a0d2f391d19931540856c496 (patch)
tree6a3fa4648a750700259cd96bcdcf3fe42fa0d9c6
parent2c7836899d16c4ee832f2fef9f84f31c10a756f5 (diff)
parentfb73c72998c11d0b51c7e4be66002d1e8b8b4eb5 (diff)
Merge "fix tox python3 overrides"
-rw-r--r--tox.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 930d526..1adf5d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,13 +32,14 @@ deps = -r{toxinidir}/requirements.txt
32 -r{toxinidir}/test-requirements.txt 32 -r{toxinidir}/test-requirements.txt
33 33
34[testenv:pep8] 34[testenv:pep8]
35basepython = python2.7 35basepython = python3
36deps = -r{toxinidir}/requirements.txt 36deps = -r{toxinidir}/requirements.txt
37 -r{toxinidir}/test-requirements.txt 37 -r{toxinidir}/test-requirements.txt
38commands = flake8 {posargs} hooks unit_tests tests actions lib 38commands = flake8 {posargs} hooks unit_tests tests actions lib
39 charm-proof 39 charm-proof
40 40
41[testenv:venv] 41[testenv:venv]
42basepython = python3
42commands = {posargs} 43commands = {posargs}
43 44
44[testenv:func27-noop] 45[testenv:func27-noop]