Cleanup requirements

requirements/deps/mock.txt

@@ -0,0 +1 @@
+mock>=1.3

requirements/deps/nose.txt

@@ -0,0 +1 @@
+nose>=1.3.7

requirements/docs.txt

@@ -1,5 +1,3 @@
 Sphinx
-SQLAlchemy
-https://github.com/celery/billiard/zipball/master
-https://github.com/celery/py-amqp/zipball/master
-https://github.com/celery/kombu/zipball/master
+-r requirements/extras/sqlalchemy.txt
+-r requirements/dev.txt

requirements/extras/beanstalk.rst

@@ -1 +0,0 @@
-beanstalkc

requirements/jython.txt

@@ -1,2 +1,2 @@
-threadpool
 multiprocessing
+-r extras/threads.txt

requirements/security.txt

@@ -1 +1 @@
-PyOpenSSL
+-r extras/auth.txt

requirements/test-ci.txt

@@ -1,2 +1,3 @@
 coverage>=3.0
 coveralls
+-r extras/redis.txt

requirements/test-pypy3.txt

@@ -1 +1 @@
-mock
+-r deps/mock.txt

requirements/test.txt

@@ -1,3 +1,3 @@
+-r deps/mock.txt
+-r deps/nose.txt
 unittest2>=0.5.1
-nose
-mock>=1.0.1

requirements/test3.txt

@@ -1 +1 @@
-nose
+-r deps/nose.txt

setup.py

@@ -116,13 +116,24 @@ def strip_comments(l):
     return l.split('#', 1)[0].strip()
 
 
-def reqs(*f):
+def _pip_requirement(req):
+    if req.startswith('-r '):
+        _, path = req.split()
+        return reqs(*path.split('/'))
+    return [req]
+
+
+def _reqs(*f):
     return [
-        r for r in (
+        _pip_requirement(r) for r in (
             strip_comments(l) for l in open(
                 os.path.join(os.getcwd(), 'requirements', *f)).readlines()
         ) if r]
 
+
+def reqs(*f):
+    return [req for subreq in _reqs(*f) for req in subreq]
+
 install_requires = reqs('default.txt')
 if JYTHON:
     install_requires.extend(reqs('jython.txt'))
@@ -164,6 +175,8 @@ features = {
 extras_require = {x: extras(x + '.txt') for x in features}
 extra['extras_require'] = extras_require
 
+print(tests_require)
+
 # -*- %%% -*-
 
 setup(