diff options
author | Zuul <zuul@review.openstack.org> | 2018-06-09 04:24:09 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-06-09 04:24:09 +0000 |
commit | 36ed4c11cb02042a0f5e58e39357ee621880ffc1 (patch) | |
tree | 7debd6e0103d803a92e82d15ae575e6bbb2fbca4 | |
parent | 3c2cf44e1ccc7774c1316d07e375c4ed9113842b (diff) | |
parent | 3cca1f4eb0d32517b9bfe51a5c487f1a4e9a23d3 (diff) |
Merge "fix tox python3 overrides"3.8.0
-rw-r--r-- | tox.ini | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -17,6 +17,7 @@ whitelist_externals = | |||
17 | bash | 17 | bash |
18 | 18 | ||
19 | [testenv:pep8] | 19 | [testenv:pep8] |
20 | basepython = python3 | ||
20 | commands = | 21 | commands = |
21 | flake8 | 22 | flake8 |
22 | # Run security linter | 23 | # Run security linter |
@@ -25,14 +26,17 @@ commands = | |||
25 | bandit -r keystoneauth1 -x tests -s B110,B410 | 26 | bandit -r keystoneauth1 -x tests -s B110,B410 |
26 | 27 | ||
27 | [testenv:bandit] | 28 | [testenv:bandit] |
29 | basepython = python3 | ||
28 | # NOTE(browne): This is required for the integration test job of the bandit | 30 | # NOTE(browne): This is required for the integration test job of the bandit |
29 | # project. Please do not remove. | 31 | # project. Please do not remove. |
30 | commands = bandit -r keystoneauth1 -x tests -s B110,B410 | 32 | commands = bandit -r keystoneauth1 -x tests -s B110,B410 |
31 | 33 | ||
32 | [testenv:venv] | 34 | [testenv:venv] |
35 | basepython = python3 | ||
33 | commands = {posargs} | 36 | commands = {posargs} |
34 | 37 | ||
35 | [testenv:cover] | 38 | [testenv:cover] |
39 | basepython = python3 | ||
36 | setenv = | 40 | setenv = |
37 | {[testenv]setenv} | 41 | {[testenv]setenv} |
38 | PYTHON=coverage run --source keystoneauth1 --parallel-mode | 42 | PYTHON=coverage run --source keystoneauth1 --parallel-mode |
@@ -43,6 +47,7 @@ commands = | |||
43 | coverage xml -o cover/coverage.xml | 47 | coverage xml -o cover/coverage.xml |
44 | 48 | ||
45 | [testenv:debug] | 49 | [testenv:debug] |
50 | basepython = python3 | ||
46 | commands = oslo_debug_helper -t keystoneauth1/tests {posargs} | 51 | commands = oslo_debug_helper -t keystoneauth1/tests {posargs} |
47 | 52 | ||
48 | [flake8] | 53 | [flake8] |
@@ -62,6 +67,7 @@ import-order-style = pep8 | |||
62 | application-import-names = keystoneauth1 | 67 | application-import-names = keystoneauth1 |
63 | 68 | ||
64 | [testenv:docs] | 69 | [testenv:docs] |
70 | basepython = python3 | ||
65 | deps = | 71 | deps = |
66 | -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} | 72 | -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} |
67 | -r{toxinidir}/doc/requirements.txt | 73 | -r{toxinidir}/doc/requirements.txt |
@@ -71,6 +77,7 @@ commands = | |||
71 | python setup.py build_sphinx | 77 | python setup.py build_sphinx |
72 | 78 | ||
73 | [testenv:releasenotes] | 79 | [testenv:releasenotes] |
80 | basepython = python3 | ||
74 | deps = | 81 | deps = |
75 | -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} | 82 | -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} |
76 | -r{toxinidir}/doc/requirements.txt | 83 | -r{toxinidir}/doc/requirements.txt |