summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-16 08:27:53 +0000
committerGerrit Code Review <review@openstack.org>2018-07-16 08:27:53 +0000
commitf3121389611222ba67c5ae8acfa669b01755c426 (patch)
tree29d015f63214c6b99138d45a64f60e760c40de94
parent418abae16366579732ef40bda2707dc5dfe0e39f (diff)
parent14a14a6727cdf061ab0d1655da8a164276ad3672 (diff)
Merge "fix tox python3 overrides"
-rw-r--r--tox.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 491a7bf..349f2b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,6 +21,7 @@ commands =
21 stestr run {posargs} 21 stestr run {posargs}
22 22
23[testenv:pep8] 23[testenv:pep8]
24basepython = python3
24whitelist_externals = bash 25whitelist_externals = bash
25commands = 26commands =
26 bash tools/flake8wrap.sh {posargs} 27 bash tools/flake8wrap.sh {posargs}
@@ -30,6 +31,7 @@ commands =
30 doc8 README.rst CONTRIBUTING.rst doc/source --ignore D001 31 doc8 README.rst CONTRIBUTING.rst doc/source --ignore D001
31 32
32[testenv:docs] 33[testenv:docs]
34basepython = python3
33setenv = PYTHONHASHSEED=0 35setenv = PYTHONHASHSEED=0
34sitepackages = False 36sitepackages = False
35envdir = {toxworkdir}/venv 37envdir = {toxworkdir}/venv
@@ -41,6 +43,7 @@ commands =
41 python setup.py build_sphinx 43 python setup.py build_sphinx
42 44
43[testenv:releasenotes] 45[testenv:releasenotes]
46basepython = python3
44deps = 47deps =
45 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} 48 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
46 -r{toxinidir}/doc/requirements.txt 49 -r{toxinidir}/doc/requirements.txt
@@ -48,6 +51,7 @@ commands =
48 sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html 51 sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
49 52
50[testenv:venv] 53[testenv:venv]
54basepython = python3
51setenv = PYTHONHASHSEED=0 55setenv = PYTHONHASHSEED=0
52commands = {posargs} 56commands = {posargs}
53 57
@@ -62,6 +66,7 @@ application-import-names = networking_generic_switch
62enable-extensions=H106,H203,H904 66enable-extensions=H106,H203,H904
63 67
64[testenv:cover] 68[testenv:cover]
69basepython = python3
65commands = 70commands =
66 coverage erase 71 coverage erase
67 coverage run --branch --include "networking_generic_switch*" -m unittest discover networking_generic_switch.tests.unit 72 coverage run --branch --include "networking_generic_switch*" -m unittest discover networking_generic_switch.tests.unit