summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-28 05:42:41 +0000
committerGerrit Code Review <review@openstack.org>2014-09-28 05:42:41 +0000
commit748a901501d42e4c85417214eff33febdb7da9e3 (patch)
tree1410bc5d8cfa681a806cecc7849194a6f7902e7e
parent5780a5d77e70443dcf785c03814cf902c6d073cd (diff)
parent8178e7811ca0f39fdaad2ca70fff9ffc18751534 (diff)
downloadtaskflow-748a901501d42e4c85417214eff33febdb7da9e3.tar.gz
Merge "Adjust docs+venv tox environments requirements/dependencies"
-rw-r--r--tox.ini7
1 files changed, 3 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 3a14bd5..d2e429f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,10 +21,7 @@ commands = python setup.py testr --slowest --testr-args='{posargs}'
[testenv:docs]
basepython = python2.7
-deps = -r{toxinidir}/requirements-py2.txt
- -r{toxinidir}/test-requirements.txt
- -r{toxinidir}/optional-requirements.txt
- doc8
+deps = {[testenv:py27]deps}
commands = python setup.py build_sphinx
doc8 doc/source
@@ -46,6 +43,8 @@ deps = {[testenv:py27]deps}
commands = python setup.py testr --coverage --testr-args='{posargs}'
[testenv:venv]
+basepython = python2.7
+deps = {[testenv:py27]deps}
commands = {posargs}
[flake8]