Clean up requirements

requirements/README.rst

@@ -6,22 +6,50 @@
 Index
 =====
 
-* `requirements/default.txt`
+* :file:`requirements/default.txt`
 
-    The default requirements (Python 2.6+).
+    Default requirements for Python 2.7+.
 
-* `requirements/py25.txt`
+* :file:`requirements/default-py3k.txt`
+
+    Default requirements for Python 3.2+.
+
+* :file:`requirements/py25.txt`
 
     Extra requirements needed to run on Python 2.5.
 
-* `requirements/py26.txt`
+* :file:`requirements/py26.txt`
 
     Extra requirements needed to run on Python 2.6.
 
-* `requirements/test.txt`
+* :file:`requirements/jython.txt`
+
+    Extra requirements needed to run on Jython 2.5
+
+* :file:`requirements/security.txt`
+
+    Extra requirements needed to use the message signing serializer,
+    see the Security Guide.
+
+* :file:`requirements/test.txt`
 
     Requirements needed to run the full unittest suite.
 
+* :file:`requirements/test-ci.txt`
+
+    Extra test requirements required by the CI suite (Tox).
+
+* :file:`requirements/doc.txt`
+
+    Extra requirements required to build the Sphinx documentation.
+
+* :file:`requirements/pkgutils.txt`
+
+    Extra requirements required to perform package distribution maintenance.
+
+* :file:`requirements/dev.txt`
+
+    Requirement file installing the current master branch of Celery and deps.
 
 
 Examples

requirements/test-ci.txt

@@ -0,0 +1,5 @@
+coverage>=3.0
+redis
+pymongo
+SQLAlchemy
+PyOpenSSL

requirements/test-py25.txt

@@ -1,2 +0,0 @@
-unittest2>=0.4.0
-simplejson

requirements/test-py3k.txt

@@ -1,6 +0,0 @@
-distribute
-nose
-nose-cover3
-coverage>=3.0
-mock>=0.7.0
-SQLAlchemy

requirements/test-pypy.txt

@@ -1,4 +0,0 @@
-nose
-nose-cover3
-coverage>=3.0
-mock>=0.7.0

setup.py

@@ -156,15 +156,7 @@ elif py_version[0:2] == (2, 5):
 
 # -*- Tests Requires -*-
 
-if is_py3k:
-    tests_require = reqs('test-py3k.txt')
-elif is_pypy:
-    tests_require = reqs('test-pypy.txt')
-else:
-    tests_require = reqs('test.txt')
-
-if py_version[0:2] == (2, 5):
-    tests_require.extend(reqs('test-py25.txt'))
+tests_require = reqs('test.txt')
 
 # -*- Long Description -*-
 

tox.ini

@@ -15,7 +15,9 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/easy_install -U distribute
            {envbindir}/pip install                              \
                 --download-cache={toxworkdir}/_download         \
-                -r{toxinidir}/requirements/test-py3k.txt
+                -r{toxinidir}/requirements/test.txt             \
+                coverage>=3.0                                   \
+                SQLAlchemy
            {toxinidir}/extra/release/py3k-run-tests {toxinidir}
 
 [testenv:py33]
@@ -27,13 +29,16 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/easy_install -U distribute
            {envbindir}/pip install                              \
                 --download-cache={toxworkdir}/_download         \
-                -r{toxinidir}/requirements/test-py3k.txt
+                -r{toxinidir}/requirements/test.txt             \
+                coverage>=3.0                                   \
+                SQLAlchemy
            {toxinidir}/extra/release/py3k-run-tests {toxinidir}
 
 [testenv:py27]
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
+       -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
@@ -46,6 +51,7 @@ basepython = python2.6
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/py26.txt
        -r{toxinidir}/requirements/test.txt
+       -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
@@ -58,6 +64,7 @@ basepython = python2.5
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/py25.txt
        -r{toxinidir}/requirements/test.txt
+       -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
@@ -68,7 +75,9 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
 [testenv:pypy]
 basepython = pypy
 deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test-pypy.txt
+       -r{toxinidir}/requirements/test.txt
+       -r{toxinidir}/requirements/test-ci.txt
+       coverag>=3.0
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \