summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-24 20:37:53 +0000
committerGerrit Code Review <review@openstack.org>2014-03-24 20:37:53 +0000
commitbf3b180f48487e7ea0627a7feedcf23963287d41 (patch)
tree401d6837742d9430c44729535e281f60893b8fae
parentfaf855314ac74395180fa3354440e15192088a84 (diff)
parentdbd4a236c607579df3efcc65a1b557492e616c8e (diff)
downloadoslotest-bf3b180f48487e7ea0627a7feedcf23963287d41.tar.gz
Merge "Require testrepository and other tools at runtime"
-rw-r--r--requirements-py3.txt4
-rw-r--r--requirements.txt4
-rw-r--r--test-requirements-py3.txt5
-rw-r--r--test-requirements.txt5
4 files changed, 8 insertions, 10 deletions
diff --git a/requirements-py3.txt b/requirements-py3.txt
index 8daebaf..2750781 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -1,4 +1,8 @@
+discover
fixtures>=0.3.14
+python-subunit>=0.0.18
+testscenarios>=0.4
+testrepository>=0.0.18
testtools>=0.9.34
mock>=1.0
mox3>=0.7.0
diff --git a/requirements.txt b/requirements.txt
index 9ef63c2..616af19 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,8 @@
+discover
fixtures>=0.3.14
+python-subunit>=0.0.18
+testrepository>=0.0.18
+testscenarios>=0.4
testtools>=0.9.34
mock>=1.0
mox>=0.5.3
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
index 03f920c..d209162 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -1,10 +1,5 @@
hacking>=0.8.0,<0.9
-discover
-python-subunit>=0.0.18
-testrepository>=0.0.18
-testscenarios>=0.4
-
# when we can require tox>= 1.4, this can go into tox.ini:
# [testenv:cover]
# deps = {[testenv]deps} coverage
diff --git a/test-requirements.txt b/test-requirements.txt
index 03f920c..d209162 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,10 +1,5 @@
hacking>=0.8.0,<0.9
-discover
-python-subunit>=0.0.18
-testrepository>=0.0.18
-testscenarios>=0.4
-
# when we can require tox>= 1.4, this can go into tox.ini:
# [testenv:cover]
# deps = {[testenv]deps} coverage