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, 16 insertions, 1 deletions

diff --git a/test-requirements.txt b/test-requirements.txt
index bbfe80b..b72ca0b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,22 @@ mock>=1.0
 python-subunit>=0.0.18
 testrepository>=0.0.18
 testtools>=0.9.34
+
+# Used for testing the WBE engine.
+kombu>=2.4.8
+
+# Used for testing zookeeper & backends.
 zake>=0.1 # Apache-2.0
-# docs build jobs
+kazoo>=1.3.1
+
+# Used for testing database persistence backends.
+#
+# NOTE(harlowja): SQLAlchemy isn't listed here currently but is
+# listed in our tox.ini files so that we can test multiple varying SQLAlchemy
+# versions to ensure a wider range of compatibility.
+alembic>=0.6.4
+psycopg2
+
+# Docs build jobs need these packages.
 sphinx>=1.1.2,!=1.2.0,<1.3
 oslosphinx>=2.2.0  # Apache-2.0