Merge "Change dependency to use flavors"2.5.0

3 files changed, 31 insertions, 40 deletions

diff --git a/setup.cfg b/setup.cfg
index e2e070f..7cfa636 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -56,6 +56,34 @@ taskflow.engines =
     worker-based = taskflow.engines.worker_based.engine:WorkerBasedActionEngine
     workers = taskflow.engines.worker_based.engine:WorkerBasedActionEngine
 
+[extras]
+zookeeper =
+  kazoo>=2.2 # Apache-2.0
+  zake>=0.1.6 # Apache-2.0
+redis =
+  redis>=2.10.0 # MIT
+workers =
+  kombu>=3.0.25 # BSD
+eventlet =
+  eventlet!=0.18.3,>=0.18.2 # MIT
+doc =
+  sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
+  oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+database =
+  SQLAlchemy<1.1.0,>=1.0.10 # MIT
+  alembic>=0.8.4 # MIT
+  SQLAlchemy-Utils # BSD License
+  PyMySQL>=0.6.2 # MIT License
+  psycopg2>=2.5 # LGPL/ZPL
+test =
+  pydotplus>=2.0.2 # MIT License
+  hacking<0.11,>=0.10.0
+  oslotest>=1.10.0 # Apache-2.0
+  mock>=2.0 # BSD
+  testtools>=1.4.0 # MIT
+  testscenarios>=0.4 # Apache-2.0/BSD
+  doc8 # Apache-2.0
+
 [nosetests]
 cover-erase = true
 verbosity = 2
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 172b449..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-hacking<0.11,>=0.10.0
-oslotest>=1.10.0 # Apache-2.0
-mock>=2.0 # BSD
-testtools>=1.4.0 # MIT
-testscenarios>=0.4 # Apache-2.0/BSD
-
-# Used for testing the WBE engine.
-kombu>=3.0.25 # BSD
-
-# Used for doc style checking
-doc8 # Apache-2.0
-
-# Used for testing zookeeper & backends.
-zake>=0.1.6 # Apache-2.0
-kazoo>=2.2 # Apache-2.0
-
-# Used for testing redis jobboards
-redis>=2.10.0 # MIT
-
-# Used for making sure pydot is still working
-pydotplus>=2.0.2 # MIT License
-
-# Used for testing database persistence backends.
-SQLAlchemy<1.1.0,>=1.0.10 # MIT
-alembic>=0.8.4 # MIT
-psycopg2>=2.5 # LGPL/ZPL
-SQLAlchemy-Utils # BSD License
-PyMySQL>=0.6.2 # MIT License
-
-# Used for making sure we still work with eventlet.
-eventlet!=0.18.3,>=0.18.2 # MIT
-
-# Docs build jobs need these packages.
-sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
-oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d838abe..90f31d5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,9 @@ envlist = cover,
     update-states
 
 [testenv]
-deps = -r{toxinidir}/test-requirements.txt
+# We need to install a bit more than just `test' because those drivers have
+# custom tests that we always run
+deps = .[test,workers,zookeeper,database,redis,eventlet,doc]
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:docs]