Merge branch '3.0'

Conflicts:
	Changelog
	README.rst
	celery/__init__.py
	celery/app/base.py
	celery/canvas.py
	celery/schedules.py
	celery/tests/tasks/test_tasks.py
	celery/tests/utilities/test_encoding.py
	celery/tests/utils/test_term.py
	celery/tests/worker/test_worker.py
	celery/worker/__init__.py
	celery/worker/consumer.py
	docs/includes/introduction.txt
	requirements/default.txt
	setup.cfg

README.rst

@@ -275,21 +275,24 @@ you are not currently using a virtualenv.
 Using the development version
 -----------------------------
 
-You can clone the repository by doing the following::
+With pip
+~~~~~~~~
 
-    $ git clone https://github.com/celery/celery
-    $ cd celery
-    $ python setup.py develop
+The Celery development version also requires the development
+versions of ``kombu``, ``amqp`` and ``billiard``.
 
-The development version will usually also depend on the development
-version of `kombu`_, the messaging framework Celery uses
-to send and receive messages, so you should also install that from git::
+You can install the latest snapshot of these using the following
+pip commands::
 
-    $ git clone https://github.com/celery/kombu
-    $ cd kombu
-    $ python setup.py develop
+    $ pip install https://github.com/celery/celery/zipball/master#egg=celery
+    $ pip install https://github.com/celery/billiard/zipball/master#egg=billiard
+    $ pip install https://github.com/celery/py-amqp/zipball/master#egg=amqp
+    $ pip install https://github.com/celery/kombu/zipball/master#egg=kombu
 
-.. _`kombu`: http://kombu.readthedocs.org/en/latest/
+With git
+~~~~~~~~
+
+Please the Contributing section.
 
 .. _getting-help:
 

celery/schedules.py

@@ -459,7 +459,8 @@ class crontab(schedule):
                                  self._orig_day_of_month,
                                  self._orig_month_of_year), None)
 
-    def remaining_delta(self, last_run_at, ffwd=ffwd):
+    def remaining_delta(self, last_run_at, tz=None, ffwd=ffwd):
+        tz = tz or self.tz
         last_run_at = self.maybe_make_aware(last_run_at)
         now = self.maybe_make_aware(self.now())
         dow_num = last_run_at.isoweekday() % 7  # Sunday is day 0, not day 7
@@ -507,7 +508,6 @@ class crontab(schedule):
                 else:
                     delta = self._delta_to_next(last_run_at,
                                                 next_hour, next_minute)
-
         return self.to_local(last_run_at), delta, self.to_local(now)
 
     def remaining_estimate(self, last_run_at, ffwd=ffwd):

celery/tests/utils/test_term.py

@@ -3,6 +3,8 @@ from __future__ import absolute_import, unicode_literals
 
 import sys
 
+from kombu.utils.encoding import str_t
+
 from celery.utils import term
 from celery.utils.term import colored, fg
 from celery.five import text_t

celery/tests/worker/test_worker.py

@@ -1192,6 +1192,8 @@ class test_WorkController(AppCase):
             call(w.sentinel), call(w.outqR_fd),
         ])
 
+        w.pool._tref_for_id = {}
+
         result = Mock()
         poolimp.on_timeout_cancel(result)
         poolimp.on_timeout_cancel(result)  # no more tref

docs/history/changelog-3.0.rst

@@ -9,6 +9,31 @@
 
 If you're looking for versions prior to 3.0.x you should go to :ref:`history`.
 
+.. _version-3.0.22:
+
+3.0.22
+======
+:release-date: 2013-08-16 16:30 P.M BST
+
+- Now depends on :ref:`Kombu 2.5.13 <kombu:version-2.5.13>`.
+
+- Now depends on :mod:`billiard` 2.7.3.32
+
+- Fixed bug with monthly and yearly crontabs (Issue #1465).
+
+    Fix contributed by Guillaume Gauvrit.
+
+- Fixed memory leak caused by time limits (Issue #1129, Issue #1427)
+
+- Worker will now sleep if being restarted more than 5 times
+  in one second to avoid spamming with ``worker-online`` events.
+
+- Includes documentation fixes
+
+    Contributed by: Ken Fromm, Andreas Savvides, Alex Kiriukha,
+    Michael Fladischer.
+
+
 .. _version-3.0.21:
 
 3.0.21

requirements/default.txt

@@ -1,3 +1,3 @@
 pytz>=2011b
-billiard>=2.7.3.31
-kombu>=2.5.11
+billiard>=2.7.3.32
+kombu>=2.5.13

setup.cfg

@@ -15,5 +15,5 @@ upload-dir = docs/.build/html
 
 [bdist_rpm]
 requires = pytz >= 2011b
-           billiard >= 2.7.3.31
-           kombu >= 2.5.11
+           billiard >= 2.7.3.32
+           kombu >= 2.5.13