Updated with new setuptools bundles

docs/includes/installation.txt

@@ -30,10 +30,37 @@ commas.
 
     $ pip install celery[librabbitmq]
 
-    $ pip install celery[librabbitmq,redis]
+    $ pip install celery[librabbitmq,redis,auth,msgpack]
 
 The following bundles are available:
 
+Serializers
+~~~~~~~~~~~
+
+:celery[auth]:
+    for using the auth serializer.
+
+:celery[msgpack]:
+    for using the msgpack serializer.
+
+:celery[yaml]:
+    for using the yaml serializer.
+
+Concurrency
+~~~~~~~~~~~
+
+:celery[eventlet]:
+    for using the eventlet pool.
+
+:celery[gevent]:
+    for using the gevent pool.
+
+:celery[threads]:
+    for using the thread pool.
+
+Transports and Backends
+~~~~~~~~~~~~~~~~~~~~~~~
+
 :celery[librabbitmq]:
     for using the librabbitmq C library.
 
@@ -43,9 +70,21 @@ The following bundles are available:
 :celery[mongodb]:
     for using MongoDB as a message transport, or as a result backend.
 
+:celery[sqs]:
+    for using Amazon SQS as a message transport.
+
+:celery[memcache]:
+    for using memcached as a result backend.
+
+:celery[cassandra]:
+    for using Apache Cassandra as a result backend.
+
 :celery[couchdb]:
     for using CouchDB as a message transport.
 
+:celery[couchbase]:
+    for using CouchBase as a result backend.
+
 :celery[beanstalk]:
     for using Beanstalk as a message transport.
 
@@ -58,6 +97,12 @@ The following bundles are available:
 :celery[sqlalchemy]:
     for using SQLAlchemy as a message transport, or as a result backend.
 
+:celery[pyro]:
+    for using the Pyro4 message transport.
+
+:celery[slmq]:
+    for using the SoftLayer Message Queue transport.
+
 .. _celery-installing-from-source:
 
 Downloading and installing from source

requirements/extras/auth.txt

@@ -0,0 +1 @@
+pyOpenSSL

requirements/extras/beanstalk.rst

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

requirements/extras/cassandra.txt

@@ -0,0 +1 @@
+pycassa

requirements/extras/couchbase.txt

@@ -0,0 +1 @@
+couchbase

requirements/extras/eventlet.txt

@@ -0,0 +1 @@
+eventlet

requirements/extras/gevent.txt

@@ -0,0 +1 @@
+gevent

requirements/extras/librabbitmq.txt

@@ -1 +1 @@
-librabbitmq>=0.9.9
+librabbitmq>=1.0.1

requirements/extras/memcache.txt

@@ -0,0 +1 @@
+pylibmc

requirements/extras/mongodb.txt

@@ -1 +1 @@
-pymongo
+pymongo>=2.6.2

requirements/extras/msgpack.txt

@@ -0,0 +1 @@
+msgpack-python>=0.3.0

requirements/extras/pyro.txt

@@ -0,0 +1 @@
+pyro4

requirements/extras/redis.txt

@@ -1 +1 @@
-redis>=2.4.4
+redis>=2.8.0

requirements/extras/slmq.txt

@@ -0,0 +1 @@
+softlayer_messaging>=1.0.3

requirements/extras/sqs.txt

@@ -0,0 +1 @@
+boto>=2.13.3

requirements/extras/threads.txt

@@ -0,0 +1 @@
+threadpool

requirements/extras/yaml.txt

@@ -0,0 +1 @@
+PyYAML>=3.10

requirements/extras/zeromq.txt

@@ -1 +1 @@
-zmq
+pyzmq>=13.1.0

requirements/extras/zookeeper.txt

@@ -1 +1 @@
-kazoo
+kazoo>=1.3.1

setup.py

@@ -184,14 +184,28 @@ if CELERY_COMPAT_PROGRAMS:
 if is_setuptools:
     extras = lambda *p: reqs('extras', *p)
     extras_require = extra['extras_require'] = {
+        # Celery specific
+        'auth': extras('auth.txt'),
+        'cassandra': extras('cassandra.txt'),
+        'memcache': extras('memcache.txt'),
+        'couchbase': extras('couchbase.txt'),
+        'threads': extras('threads.txt'),
+        'eventlet': extras('eventlet.txt'),
+        'gevent': extras('gevent.txt'),
+
+        'msgpack': extras('msgpack.txt'),
+        'yaml': extras('yaml.txt'),
         'redis': extras('redis.txt'),
         'mongodb': extras('mongodb.txt'),
+        'sqs': extras('sqs.txt'),
         'couchdb': extras('couchdb.txt'),
         'beanstalk': extras('beanstalk.txt'),
         'zookeeper': extras('zookeeper.txt'),
         'zeromq': extras('zeromq.txt'),
         'sqlalchemy': extras('sqlalchemy.txt'),
         'librabbitmq': extras('librabbitmq.txt'),
+        'pyro': extras('pyro.txt'),
+        'slmq': extras('slmq.txt'),
     }
 
 # -*- %%% -*-