Move some of the custom requirements out of tox.ini

This change removes the need for an optional-requirements
file which isn't being kept up to date with the rest of the
openstack ecosystem and moves most of the customizations to
test-requirements and where different versions are still
needed (aka for SQLAlchemy) we place those varations into
there needed tox environment as required.

Change-Id: I443794b83de3f6a196fa7fc29a90620fb51b7f4c

1 files changed, 10 insertions, 12 deletions

diff --git a/tox.ini b/tox.ini
index 83030ce..bc91277 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,10 +17,6 @@ usedevelop = True
 install_command = pip install {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/test-requirements.txt
-    alembic>=0.4.1
-    psycopg2
-    kazoo>=1.3.1
-    kombu>=2.4.8
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:docs]
@@ -61,18 +57,20 @@ exclude = .venv,.tox,dist,doc,./taskflow/openstack/common,*egg,.git,build,tools
 # NOTE(imelnikov): pyXY envs are considered to be default, so they must have
 # richest set of test requirements
 [testenv:py26]
+basepython = python2.6
 deps = {[testenv]deps}
     -r{toxinidir}/requirements-py2.txt
-    SQLAlchemy>=0.7.8,<=0.7.99
     MySQL-python
     eventlet>=0.13.0
-basepython = python2.6
+    SQLAlchemy>=0.7.8,<=0.7.99
 
 [testenv:py27]
-deps = -r{toxinidir}/requirements-py2.txt
-    -r{toxinidir}/optional-requirements.txt
-    -r{toxinidir}/test-requirements.txt
-    doc8>=0.3.4
+deps = {[testenv]deps}
+    -r{toxinidir}/requirements-py2.txt
+    MySQL-python
+    eventlet>=0.13.0
+    SQLAlchemy>=0.7.8,<=0.9.99
+    doc8
 commands = 
     python setup.py testr --slowest --testr-args='{posargs}'
     sphinx-build -b doctest doc/source doc/build
@@ -89,15 +87,15 @@ deps = {[testenv]deps}
     SQLAlchemy>=0.7.8,<=0.9.99
 
 [testenv:py26-sa7-mysql]
+basepython = python2.6
 deps = {[testenv]deps}
     -r{toxinidir}/requirements-py2.txt
     SQLAlchemy>=0.7.8,<=0.7.99
     MySQL-python
-basepython = python2.6
 
 [testenv:py27-sa8-mysql]
+basepython = python2.7
 deps = {[testenv]deps}
     -r{toxinidir}/requirements-py2.txt
     SQLAlchemy>=0.8,<=0.8.99
     MySQL-python
-basepython = python2.7