Depend on kombu 2.2.1

celery/bin/celery.py

@@ -198,7 +198,7 @@ def create_delegate(name, Command):
 class worker(Delegate):
     """Start worker instance.
 
-    Examples:
+    Examples::
 
         celery worker --app=proj -l info
         celery worker -A proj -l info -Q hipri,lopri
@@ -215,7 +215,8 @@ worker = command(worker, sortpri=01)
 class events(Delegate):
     """Event-stream utilities.
 
-    Commands:
+    Commands::
+
         celery events --app=proj
             start graphical monitor (requires curses)
         celery events -d --app=proj
@@ -224,7 +225,8 @@ class events(Delegate):
         celery events -C <camera> [options]
             run snapshot camera.
 
-    Examples:
+    Examples::
+
         celery events
         celery events -d
         celery events -C mod.attr -F 1.0 --detach --maxrate=100/m -l info
@@ -236,7 +238,7 @@ events = command(events, sortpri=10)
 class beat(Delegate):
     """Start the celerybeat periodic task scheduler.
 
-    Examples:
+    Examples::
 
         celery beat -l info
         celery beat -s /var/run/celerybeat/schedule --detach
@@ -271,7 +273,7 @@ amqp = command(amqp, sortpri=30)
 class list_(Command):
     """Get info from broker.
 
-    Examples:
+    Examples::
 
         celery list bindings
 
@@ -309,7 +311,7 @@ list_ = command(list_, "list")
 class apply(Command):
     """Apply a task by name.
 
-    Examples:
+    Examples::
 
         celery apply tasks.add --args='[2, 2]'
         celery apply tasks.add --args='[2, 2]' --countdown=10
@@ -384,7 +386,7 @@ purge = command(purge)
 class result(Command):
     """Gives the return value for a given task id.
 
-    Examples:
+    Examples::
 
         celery result 8f511516-e2f5-4da4-9d2f-0fb83a86e500
         celery result 8f511516-e2f5-4da4-9d2f-0fb83a86e500 -t tasks.add
@@ -510,7 +512,7 @@ class inspect(_RemoteControl):
 
     Availability: RabbitMQ (amqp), Redis, and MongoDB transports.
 
-    Examples:
+    Examples::
 
         celery inspect active --timeout=5
         celery inspect scheduled -d worker1.example.com
@@ -541,7 +543,7 @@ class control(_RemoteControl):
 
     Availability: RabbitMQ (amqp), Redis, and MongoDB transports.
 
-    Examples:
+    Examples::
 
         celery control enable_events --timeout=5
         celery control -d worker1.example.com enable_events
@@ -625,7 +627,7 @@ status = command(status)
 class migrate(Command):
     """Migrate tasks from one broker to another.
 
-    Examples:
+    Examples::
 
         celery migrate redis://localhost amqp://guest@localhost//
         celery migrate django:// redis://localhost
@@ -662,7 +664,7 @@ class shell(Command):  # pragma: no cover
           subtask, Task
         - all registered tasks.
 
-    Example Session:
+    Example Session::
 
         $ celery shell
 

docs/whatsnew-2.6.rst

@@ -280,7 +280,7 @@ Additional control commands made public
     These commands are available programmatically as
     :meth:`@control.add_consumer` / :meth:`@control.cancel_consumer`:
 
-    .. code-block::
+    .. code-block:: python
 
         >>> celery.control.add_consumer(queue_name,
         ...     destination=["w1.example.com"])
@@ -304,7 +304,7 @@ Additional control commands made public
 
     This command is available programmatically as :meth:`@control.autoscale`:
 
-    .. code-block::
+    .. code-block:: python
 
         >>> celery.control.autoscale(max=10, min=5,
         ...     destination=["w1.example.com"])
@@ -320,7 +320,7 @@ Additional control commands made public
     These commands are available programmatically as
     :meth:`@control.pool_grow` / :meth:`@control.pool_shrink`:
 
-    .. code-block::
+    .. code-block:: python
 
         >>> celery.control.pool_grow(2, destination=["w1.example.com"])
         >>> celery.contorl.pool_shrink(2, destination=["w1.example.com"])

requirements/default-py3k.txt

@@ -1,4 +1,4 @@
 billiard>=2.7.3.9
 python-dateutil>=2.0
 pytz
-kombu>=2.1.8
+kombu>=2.2.1

requirements/default.txt

@@ -1,3 +1,3 @@
 billiard>=2.7.3.9
 python-dateutil>=1.5,<2.0
-kombu>=2.2.0,<3.0
+kombu>=2.2.1,<3.0

setup.cfg

@@ -18,5 +18,5 @@ requires = uuid
            importlib
            billiard>=2.7.3.9
            python-dateutil >= 1.5
-           kombu >= 2.2.0
+           kombu >= 2.2.1
            ordereddict