Merge "Move runtime test resources into setup.cfg [extras]"

3 files changed, 6 insertions, 3 deletions

diff --git a/requirements.txt b/requirements.txt
index f317632..a6dff37 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,5 +14,3 @@ SQLAlchemy<1.1.0,>=0.9.9
 sqlalchemy-migrate>=0.9.6
 stevedore>=1.5.0 # Apache-2.0
 six>=1.9.0
-testresources>=0.2.4
-testscenarios>=0.4
diff --git a/setup.cfg b/setup.cfg
index a87da66..abb016b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -54,6 +54,11 @@ keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = oslo.db/locale/oslo.db.pot
 
+[extras]
+fixtures =
+  testresources>=0.2.4
+  testscenarios>=0.4
+
 [pbr]
 # NOTE(viktors): uncomment ``warnerrors`` line, when setup.cfg we then
 # want to treat sphinx warnings as errors
diff --git a/tox.ini b/tox.ini
index 4f6bd72..f8603fa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ whitelist_externals = bash
 install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/requirements.txt
+deps = .[fixtures]
        -r{toxinidir}/test-requirements.txt
 commands = bash tools/pretty_tox.sh '{posargs}'