Merge branch 'master' of github.com:ask/celery

Changelog

@@ -10,8 +10,6 @@
 2.3.0
 =====
 :release-date: TBA
-:status: frozen
-:branch: master
 
 :tested: cPython: 2.5, 2.6, 2.7; PyPy: 1.5; Jython: 2.5.2
 
@@ -20,6 +18,8 @@
 Important Notes
 ---------------
 
+* Now requires Kombu 1.2.1
+
 * Results are now disabled by default.
 
     The AMQP backend was not a good default because often the users were
@@ -40,6 +40,12 @@ Important Notes
 
     For help choosing a backend please see :ref:`task-result-backends`.
 
+* The debian init scripts have been deprecated in favor of the generic-init.d
+  init scripts.
+
+    In addition generic init scripts for celerybeat and celeryev has been
+    added.
+
 .. _v230-news:
 
 News
@@ -216,6 +222,11 @@ Fixes
 * ``CELERY_TASK_ERROR_WHITE_LIST`` is now properly initialized
   in all loaders.
 
+* celeryd_detach now passes thorugh commandline configuration.
+
+* Remote control command ``add_consumer`` now does nothing if the
+  queue is already being consumed from.
+
 
 .. _version-2.2.7:
 

README.rst

@@ -2,9 +2,9 @@
  celery - Distributed Task Queue
 =================================
 
-.. image:: http://cloud.github.com/downloads/ask/celery/celery_favicon_128.png
+.. image:: http://cloud.github.com/downloads/ask/celery/celery_128.png
 
-:Version: 2.3.0rc2
+:Version: 2.3.0
 :Web: http://celeryproject.org/
 :Download: http://pypi.python.org/pypi/celery/
 :Source: http://github.com/ask/celery/

celery/__init__.py

@@ -5,7 +5,7 @@
 import os
 import sys
 
-VERSION = (2, 3, 0, "rc2")
+VERSION = (2, 3, 0)
 
 __version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:])
 __author__ = "Ask Solem"

celery/tests/test_worker/test_worker.py

@@ -854,7 +854,6 @@ class test_WorkController(AppCase):
         finally:
             state.Persistent = Persistent
 
-    @skip("Issue #264")
     def test_disable_rate_limits(self):
         from celery.worker.buckets import FastQueue
         worker = self.create_worker(disable_rate_limits=True)

docs/.templates/page.html

@@ -2,7 +2,7 @@
 {% block body %}
 <div class="deck">
 
-    {% if version == "2.3" or version == "3.0" %}
+    {% if version == "2.4" or version == "3.0" %}
         <p class="developmentversion">
         This document is for Celery's development version, which can be
         significantly different from previous releases. Get old docs here:

docs/.templates/sidebarintro.html

@@ -1,4 +1,4 @@
 <p class="logo"><a href="{{ pathto(master_doc) }}">
-  <img class="logo" src="http://cloud.github.com/downloads/ask/celery/celery_favicon_128.png" alt="Logo"/>
+  <img class="logo" src="http://cloud.github.com/downloads/ask/celery/celery_128.png" alt="Logo"/>
 </a></p>
 

docs/.templates/sidebarlogo.html

@@ -1,3 +1,3 @@
 <p class="logo"><a href="{{ pathto(master_doc) }}">
-  <img class="logo" src="http://cloud.github.com/downloads/ask/celery/celery_favicon_128.png" alt="Logo"/>
+  <img class="logo" src="http://cloud.github.com/downloads/ask/celery/celery_128.png" alt="Logo"/>
 </a></p>

docs/includes/introduction.txt

@@ -1,4 +1,4 @@
-:Version: 2.3.0rc2
+:Version: 2.3.0
 :Web: http://celeryproject.org/
 :Download: http://pypi.python.org/pypi/celery/
 :Source: http://github.com/ask/celery/

docs/templates/readme.txt

@@ -2,7 +2,7 @@
  celery - Distributed Task Queue
 =================================
 
-.. image:: http://cloud.github.com/downloads/ask/celery/celery_favicon_128.png
+.. image:: http://cloud.github.com/downloads/ask/celery/celery_128.png
 
 .. include:: ../includes/introduction.txt
 

requirements/py25.txt

@@ -1,2 +1,3 @@
 multiprocessing==2.6.2.1
 importlib
+ordereddict

requirements/py26.txt

@@ -1 +1,2 @@
 importlib
+ordereddict

setup.py

@@ -59,8 +59,6 @@ if sys.version_info < (2, 7):
     install_requires.append("ordereddict") # Replacement for the ordered dict
 if sys.version_info < (2, 6) and not (is_jython or is_pypy):
     install_requires.append("multiprocessing")
-if sys.version_info < (2, 5):
-    install_requires.append("uuid")
 
 if is_jython:
     install_requires.append("threadpool")