Merge "Adjust docs+venv tox environments requirements/dependencies"

2014-09-28 05:42:41 +00:00
parent 5780a5d77e 8178e7811c
commit 748a901501
1 changed files with 3 additions and 4 deletions
--- 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]