summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-12 10:45:01 +0000
committerGerrit Code Review <review@openstack.org>2018-10-12 10:45:01 +0000
commiteac2145e5ec8be2bcb1d98f2105adf541b1efdc0 (patch)
tree858e514a5aa1dcb92e2d545ae0e281c1cb398634
parentf17118ef4f58504e7e2f647c2082b37a480ecf99 (diff)
parent8551467d3e3f9fbb7f6b7d3cf9f9ffb7e89f988d (diff)
Merge "fix tox python3 overrides"HEADmaster
-rw-r--r--tox.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 0b486b1..9a4f65c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,11 +15,12 @@ basepython = python2.7
15deps = -r{toxinidir}/test-requirements.txt 15deps = -r{toxinidir}/test-requirements.txt
16 16
17[testenv:pep8] 17[testenv:pep8]
18basepython = python2.7 18basepython = python3
19deps = -r{toxinidir}/test-requirements.txt 19deps = -r{toxinidir}/test-requirements.txt
20commands = flake8 {posargs} 20commands = flake8 {posargs}
21 21
22[testenv:venv] 22[testenv:venv]
23basepython = python3
23commands = {posargs} 24commands = {posargs}
24 25
25[flake8] 26[flake8]