summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-11 16:17:32 +0000
committerGerrit Code Review <review@openstack.org>2019-02-11 16:17:32 +0000
commit7af72995d0860dd20c4c6f254c276c2b9bccda39 (patch)
tree4d19a6062bf24ef97293cbdbf3925c247c5d463a
parent5a44b5be490d3a3db567a13f58fccb3e82247680 (diff)
parent90cb458f7e3220e258e3e5256b627feca20461d6 (diff)
Merge "fix tox python3 overrides"
-rw-r--r--tox.ini4
1 files changed, 3 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 3fcb63e..154dfa3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,6 @@ minversion = 2.3
4skipsdist = True 4skipsdist = True
5 5
6[testenv] 6[testenv]
7basepython = python3
8install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} 7install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
9setenv = VIRTUAL_ENV={envdir} 8setenv = VIRTUAL_ENV={envdir}
10 OS_STDOUT_CAPTURE=1 9 OS_STDOUT_CAPTURE=1
@@ -14,6 +13,7 @@ deps = -r{toxinidir}/test-requirements.txt
14whitelist_externals = reno 13whitelist_externals = reno
15 14
16[testenv:linters] 15[testenv:linters]
16basepython = python3
17whitelist_externals = bash 17whitelist_externals = bash
18#bashate ignore errors 18#bashate ignore errors
19#E010: do not on the same line as for 19#E010: do not on the same line as for
@@ -33,6 +33,7 @@ commands =
33 -print0 | xargs -0 yamllint" 33 -print0 | xargs -0 yamllint"
34 34
35[testenv:pep8] 35[testenv:pep8]
36basepython = python3
36usedevelop = False 37usedevelop = False
37deps = 38deps =
38 flake8<3.6.0 39 flake8<3.6.0
@@ -71,6 +72,7 @@ commands =
71whitelist_externals = rm 72whitelist_externals = rm
72 73
73[testenv:newnote] 74[testenv:newnote]
75basepython = python3
74# Re-use the releasenotes venv 76# Re-use the releasenotes venv
75envdir = {toxworkdir}/releasenotes 77envdir = {toxworkdir}/releasenotes
76deps = -r{toxinidir}/doc/requirements.txt 78deps = -r{toxinidir}/doc/requirements.txt