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

CONTRIBUTORS.txt

@@ -217,3 +217,4 @@ Anand Reddy Pandikunta, 2016/06/18
 Adriano Martins de Jesus, 2016/06/22
 Kevin Richardson, 2016/06/29
 Andrew Stewart, 2016/07/04
+Xin Li, 2016/08/03

celery/tests/apps/test_multi.py

@@ -8,7 +8,7 @@ from celery.apps.multi import (
     Cluster, MultiParser, NamespacedOptionParser, Node, format_opt,
 )
 
-from celery.tests.case import AppCase, Mock, call, patch
+from celery.tests.case import AppCase, Mock, call, patch, skip
 
 
 class test_functions(AppCase):
@@ -376,6 +376,7 @@ class test_Cluster(AppCase):
         for node in nodes:
             node.send.assert_called_with(15, self.cluster.on_node_signal_dead)
 
+    @skip.if_win32()
     def test_kill(self):
         self.cluster.send_all = Mock(name='.send_all')
         self.cluster.kill()

docs/contributing.rst

@@ -890,6 +890,12 @@ Ask Solem
 :github: https://github.com/ask
 :twitter: http://twitter.com/#!/asksol
 
+Asif Saif Uddin
+~~~~~~~~~~~~~~~
+
+:github: https://github.com/auvipy
+:twitter: https://twitter.com/#!/auvipy
+
 Dmitry Malinovsky
 ~~~~~~~~~~~~~~~~~
 

docs/django/first-steps-with-django.rst

@@ -111,9 +111,7 @@ of your installed apps, following the ``tasks.py`` convention::
 
 
 This way you don't have to manually add the individual modules
-to the :setting:`CELERY_IMPORTS <imports>` setting. The ``lambda`` so that the
-auto-discovery can happen only when needed, and so that importing your
-module won't evaluate the Django settings object.
+to the :setting:`CELERY_IMPORTS <imports>` setting.
 
 Finally, the ``debug_task`` example is a task that dumps
 its own request information. This is using the new ``bind=True`` task option
@@ -186,6 +184,8 @@ To use this with your project you need to follow these steps:
 
     For the cache backend you can use:
 
+    .. code-block:: python
+
         CELERY_RESULT_BACKEND = 'django-cache'
 
 ``django-celery-beat`` -- Database-backed Periodic Tasks with Admin interface.

docs/userguide/canvas.rst

@@ -930,13 +930,15 @@ Example implementation:
 
 This is used by all result backends except Redis and Memcached: they
 increment a counter after each task in the header, then applies the callback
-when the counter exceeds the number of tasks in the set. *Note:* chords don't
-properly work with Redis before version 2.2; you'll need to upgrade to at
-least *redis-server* 2.2 to use them.
+when the counter exceeds the number of tasks in the set.
 
 The Redis and Memcached approach is a much better solution, but not easily
 implemented in other backends (suggestions welcome!).
 
+.. note::
+
+   Chords don't properly work with Redis before version 2.2; you'll need to
+   upgrade to at least redis-server 2.2 to use them.
 
 .. note::
 

docs/whatsnew-4.0.rst

@@ -104,7 +104,7 @@ and also drops support for Python 3.3 so supported versions are:
 - CPython 2.7
 - CPython 3.4
 - CPython 3.5
-- PyPy 4.0 (``pypy2``)
+- PyPy 5.3 (``pypy2``)
 - PyPy 2.4 (``pypy3``)
 
 Last major version to support Python 2
@@ -444,17 +444,17 @@ upgrade to 4.0:
 Django: Auto-discover now supports Django app configurations
 ------------------------------------------------------------
 
-The :meth:`@autodiscover` function can now be called without arguments,
+The ``autodiscover_tasks()`` function can now be called without arguments,
 and the Django handler will automatically find your installed apps:
 
 .. code-block:: python
 
-    app.autodiscover()
+    app.autodiscover_tasks()
 
 The Django integration :ref:`example in the documentation
 <django-first-steps>` has been updated to use the argument-less call.
 
-This also ensures comaptibility with the new, ehm, ``appconfig`` stuff
+This also ensures compatibility with the new, ehm, ``AppConfig`` stuff
 introduced in recent Django versions.
 
 Worker direct queues no longer use auto-delete
@@ -584,8 +584,8 @@ some long-requested features:
     related messages together (like chains, groups, chords, complete
     work-flows, etc).
 
-- ``app.TaskProducer`` replaced by :meth:`@amqp.create_task_message`` and
-  :meth:`@amqp.send_task_message``.
+- ``app.TaskProducer`` replaced by :meth:`@amqp.create_task_message` and
+  :meth:`@amqp.send_task_message`.
 
     Dividing the responsibilities into creating and sending means that
     people who want to send messages using a Python AMQP client directly,
@@ -1343,7 +1343,7 @@ Deployment
 ~~~~~~~~~~
 
 - Generic init-scripts now support
-  :envvar:`CELERY_SU`` and :envvar:`CELERYD_SU_ARGS` environment variables
+  :envvar:`CELERY_SU` and :envvar:`CELERYD_SU_ARGS` environment variables
   to set the path and arguments for :command:`su` (:manpage:`su(1)`).
 
 - Generic init-scripts now better support FreBSD and other BSD
@@ -1398,7 +1398,7 @@ Result Backends
   with brain damaged MySQL unicode implementation (Issue #1748).
 
 - **General**: All Celery exceptions/warnings now inherit from common
-  :class:`~celery.exceptions.CeleryException`/:class:`~celery.exceptions.CeleryWarning`.
+  :class:`~celery.exceptions.CeleryError`/:class:`~celery.exceptions.CeleryWarning`.
   (Issue #2643).
 
 Documentation Improvements