summaryrefslogtreecommitdiff
path: root/requirements
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2012-08-29 15:46:46 +0100
committerAsk Solem <ask@celeryproject.org>2012-08-29 15:46:46 +0100
commitf1fe4e6881916e6993d7aa548f9d8601562a225e (patch)
tree9a4bb4ef2c84bbbe916f1f60c54101ec2b6ea9da /requirements
parentc0244d514efe1694576683b6355ab123b809f620 (diff)
parentb7c5f069a42aa400fffdf3c49f626fe7871ab8e4 (diff)
downloadkombu-asynchronous-broadcasts.tar.gz
Merge branch 'master' into asynchronous-broadcastsasynchronous-broadcasts
Diffstat (limited to 'requirements')
-rw-r--r--requirements/test-ci.txt3
-rw-r--r--requirements/test-jython.txt6
-rw-r--r--requirements/test-py3k.txt2
-rw-r--r--requirements/test-pypy.txt7
-rw-r--r--requirements/test.txt4
5 files changed, 3 insertions, 19 deletions
diff --git a/requirements/test-ci.txt b/requirements/test-ci.txt
new file mode 100644
index 00000000..19049d44
--- /dev/null
+++ b/requirements/test-ci.txt
@@ -0,0 +1,3 @@
+coverage>=3.0
+PyYAML
+msgpack-python<0.2.0 # 0.2.0 dropped 2.5 support
diff --git a/requirements/test-jython.txt b/requirements/test-jython.txt
deleted file mode 100644
index 8931aca4..00000000
--- a/requirements/test-jython.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-nose
-nose-cover3
-unittest2>=0.5.0
-coverage>=3.0
-mock>=0.7.0
-simplejson
diff --git a/requirements/test-py3k.txt b/requirements/test-py3k.txt
index 87e69702..3b76ba50 100644
--- a/requirements/test-py3k.txt
+++ b/requirements/test-py3k.txt
@@ -1,5 +1,3 @@
distribute
nose
-nose-cover3
-coverage>=3.0
mock>=0.7.0
diff --git a/requirements/test-pypy.txt b/requirements/test-pypy.txt
deleted file mode 100644
index c0af83aa..00000000
--- a/requirements/test-pypy.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-nose
-nose-cover3
-unittest2>=0.5.0
-coverage>=3.0
-mock>=0.7.0
-simplejson
-PyYAML==3.09 # 3.10 dropped 2.4 support
diff --git a/requirements/test.txt b/requirements/test.txt
index 75350c84..5cf3124c 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,8 +1,4 @@
nose
nose-cover3
unittest2>=0.5.0
-coverage>=3.0
mock
-simplejson
-PyYAML
-msgpack-python<0.2.0 # 0.2.0 dropped 2.5 support