[Python-modules-commits] [celery] 10/11: merge patched into master
Brian May
bam at moszumanska.debian.org
Wed Nov 18 22:21:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository celery.
commit 27dbd75d3d2f9b29d83a558fa368f368a234b224
Merge: de9aece 3efb36b
Author: Brian May <bam at debian.org>
Date: Thu Nov 19 09:10:19 2015 +1100
merge patched into master
CONTRIBUTORS.txt | 15 ++
Changelog | 81 +++++++++
LICENSE | 6 +-
PKG-INFO | 4 +-
README.rst | 2 +-
celery.egg-info/PKG-INFO | 4 +-
celery.egg-info/requires.txt | 4 +-
celery/__init__.py | 9 +-
celery/app/base.py | 3 +-
celery/app/control.py | 2 +-
celery/app/task.py | 23 ++-
celery/apps/worker.py | 3 +-
celery/backends/__init__.py | 7 +-
celery/backends/amqp.py | 3 +-
celery/backends/base.py | 11 +-
celery/backends/database/__init__.py | 4 +-
celery/backends/mongodb.py | 41 +++--
celery/backends/redis.py | 48 +++---
celery/beat.py | 58 ++++---
celery/bin/amqp.py | 11 ++
celery/bin/beat.py | 6 +-
celery/bin/celery.py | 3 +-
celery/bin/events.py | 6 +-
celery/concurrency/asynpool.py | 2 +-
celery/concurrency/eventlet.py | 6 +-
celery/concurrency/prefork.py | 3 +-
celery/events/cursesmon.py | 4 +-
celery/five.py | 31 ++--
celery/fixups/django.py | 10 +-
celery/local.py | 182 +++++++++++++++------
celery/platforms.py | 45 ++++-
celery/task/trace.py | 2 +-
celery/tests/app/test_app.py | 10 +-
celery/tests/app/test_beat.py | 4 +-
celery/tests/app/test_loaders.py | 3 +-
celery/tests/backends/test_amqp.py | 63 ++++++-
celery/tests/backends/test_mongodb.py | 50 +++++-
celery/tests/backends/test_redis.py | 6 +
celery/tests/case.py | 6 +-
celery/tests/compat_modules/test_compat.py | 8 +-
celery/tests/events/test_state.py | 3 +-
celery/tests/tasks/test_chord.py | 4 +-
celery/tests/utils/test_platforms.py | 14 +-
celery/tests/utils/test_threads.py | 4 +-
celery/tests/worker/test_hub.py | 3 +-
celery/tests/worker/test_loops.py | 11 +-
celery/utils/term.py | 7 +-
celery/worker/components.py | 2 +-
celery/worker/job.py | 7 +-
celery/worker/loops.py | 6 +
debian/.git-dpm | 6 +-
...h => 0006-ci-Tests-passing-on-Python-3.5.patch} | 2 +-
...rove-the-magic-module-check-Closes-801640.patch | 33 ----
debian/patches/0007-Update-license.patch | 66 ++++++++
debian/patches/disable_unstable_tests.patch | 2 +-
debian/patches/drop_downgrade.patch | 6 +-
debian/patches/fix_test_typos.patch | 40 -----
debian/patches/intersphinx.patch | 6 +-
debian/patches/lsb-init.patch | 2 +-
debian/patches/privacy.patch | 2 +-
debian/patches/series | 5 +-
docs/_ext/applyxrefs.py | 2 -
docs/changelog.rst | 81 +++++++++
docs/conf.py | 20 +--
docs/configuration.rst | 159 +++++++++++++-----
docs/copyright.rst | 19 ++-
docs/getting-started/first-steps-with-celery.rst | 8 +-
docs/includes/introduction.txt | 2 +-
docs/userguide/canvas.rst | 6 +-
docs/userguide/monitoring.rst | 2 +-
docs/userguide/periodic-tasks.rst | 3 +
docs/userguide/routing.rst | 2 +-
docs/userguide/security.rst | 5 +-
docs/userguide/tasks.rst | 41 ++---
examples/app/myapp.py | 5 +-
examples/django/proj/__init__.py | 2 +-
examples/django/proj/celery.py | 2 +-
examples/django/proj/settings.py | 2 +-
examples/django/proj/urls.py | 7 +-
examples/django/proj/wsgi.py | 2 +-
examples/eventlet/celeryconfig.py | 2 +-
examples/gevent/celeryconfig.py | 2 +-
examples/next-steps/setup.py | 2 +-
requirements/default.txt | 4 +-
requirements/docs.txt | 2 +-
requirements/jython.txt | 2 +-
requirements/test-ci.txt | 7 +-
setup.py | 10 +-
88 files changed, 984 insertions(+), 437 deletions(-)
diff --cc debian/.git-dpm
index 47b4d13,0000000..cdd6282
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- d2d5d9e8b2baf5225f978ab2c522bbe02cd0887d
- d2d5d9e8b2baf5225f978ab2c522bbe02cd0887d
- 1ca0fad35008a3f2554cd40b0851196a42e715e8
++3efb36ba8df1489027ab2226743b978548de3ed7
++3efb36ba8df1489027ab2226743b978548de3ed7
++ecfab0e5f18c81b19617e93999463c55955d714a
+ecfab0e5f18c81b19617e93999463c55955d714a
+celery_3.1.19.orig.tar.gz
+06465daff8e316cd212a01ea87125de8afc7a4d1
+1302241
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0006-ci-Tests-passing-on-Python-3.5.patch
index 2f3faff,0000000..10f8a97
mode 100644,000000..100644
--- a/debian/patches/0006-ci-Tests-passing-on-Python-3.5.patch
+++ b/debian/patches/0006-ci-Tests-passing-on-Python-3.5.patch
@@@ -1,114 -1,0 +1,114 @@@
- From d2d5d9e8b2baf5225f978ab2c522bbe02cd0887d Mon Sep 17 00:00:00 2001
++From 59c070edc48f6fc504b74ce321cbbefffb0df81d Mon Sep 17 00:00:00 2001
+From: Ask Solem <ask at celeryproject.org>
+Date: Mon, 28 Sep 2015 13:05:44 -0700
+Subject: [ci] Tests passing on Python 3.5
+
+---
+ celery/tests/utils/test_functional.py | 5 ++++-
+ celery/utils/functional.py | 21 ++++++++++-----------
+ 2 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/celery/tests/utils/test_functional.py b/celery/tests/utils/test_functional.py
+index e564a41..99b4f65 100644
+--- a/celery/tests/utils/test_functional.py
++++ b/celery/tests/utils/test_functional.py
+@@ -1,6 +1,7 @@
+ from __future__ import absolute_import
+
+ import pickle
++import sys
+
+ from kombu.utils.functional import lazy
+
+@@ -14,7 +15,7 @@ from celery.utils.functional import (
+ maybe_list,
+ )
+
+-from celery.tests.case import Case
++from celery.tests.case import Case, SkipTest
+
+
+ class test_LRUCache(Case):
+@@ -63,6 +64,8 @@ class test_LRUCache(Case):
+ self.assertEqual(list(x.keys()), [3, 6, 7])
+
+ def assertSafeIter(self, method, interval=0.01, size=10000):
++ if sys.version_info >= (3,5):
++ raise SkipTest('Fails on Py3.5')
+ from threading import Thread, Event
+ from time import sleep
+ x = LRUCache(size)
+diff --git a/celery/utils/functional.py b/celery/utils/functional.py
+index 600b65e..d3e64f2 100644
+--- a/celery/utils/functional.py
++++ b/celery/utils/functional.py
+@@ -24,7 +24,7 @@ __all__ = ['LRUCache', 'is_list', 'maybe_list', 'memoize', 'mlazy', 'noop',
+ 'first', 'firstmethod', 'chunks', 'padlist', 'mattrgetter', 'uniq',
+ 'regen', 'dictfilter', 'lazy', 'maybe_evaluate']
+
+-IS_PYPY = hasattr(sys, 'pypy_version_info')
++IS_PY3 = sys.version_info[0] == 3
+
+ KEYWORD_MARK = object()
+
+@@ -56,7 +56,7 @@ class LRUCache(UserDict):
+ def __getitem__(self, key):
+ with self.mutex:
+ value = self[key] = self.data.pop(key)
+- return value
++ return value
+
+ def update(self, *args, **kwargs):
+ with self.mutex:
+@@ -68,9 +68,7 @@ class LRUCache(UserDict):
+ for item in islice(iter(data), len(data) - limit):
+ data.pop(item)
+
+- def popitem(self, last=True, _needs_lock=IS_PYPY):
+- if not _needs_lock:
+- return self.data.popitem(last)
++ def popitem(self, last=True):
+ with self.mutex:
+ return self.data.popitem(last)
+
+@@ -84,8 +82,8 @@ class LRUCache(UserDict):
+ def __iter__(self):
+ return iter(self.data)
+
+- def _iterate_items(self, _need_lock=IS_PYPY):
+- with self.mutex if _need_lock else DummyContext():
++ def _iterate_items(self):
++ with self.mutex:
+ for k in self:
+ try:
+ yield (k, self.data[k])
+@@ -93,8 +91,8 @@ class LRUCache(UserDict):
+ pass
+ iteritems = _iterate_items
+
+- def _iterate_values(self, _need_lock=IS_PYPY):
+- with self.mutex if _need_lock else DummyContext():
++ def _iterate_values(self):
++ with self.mutex:
+ for k in self:
+ try:
+ yield self.data[k]
+@@ -105,7 +103,8 @@ class LRUCache(UserDict):
+
+ def _iterate_keys(self):
+ # userdict.keys in py3k calls __getitem__
+- return keys(self.data)
++ with self.mutex:
++ return keys(self.data)
+ iterkeys = _iterate_keys
+
+ def incr(self, key, delta=1):
+@@ -114,7 +113,7 @@ class LRUCache(UserDict):
+ # integer as long as it exists and we can cast it
+ newval = int(self.data.pop(key)) + delta
+ self[key] = str(newval)
+- return newval
++ return newval
+
+ def __getstate__(self):
+ d = dict(vars(self))
diff --cc debian/patches/0007-Update-license.patch
index 0000000,0000000..c20181b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-Update-license.patch
@@@ -1,0 -1,0 +1,66 @@@
++From 3efb36ba8df1489027ab2226743b978548de3ed7 Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Thu, 19 Nov 2015 09:08:48 +1100
++Subject: Update license.
++
++This was applied upstream.
++
++3.1 branch:
++https://github.com/celery/celery/commit/9a51e325b29d82834fdbd809a28a64b21c7ee64d
++
++master branch:
++https://github.com/celery/celery/commit/ef107f05e042876efaab7c75f71262727a8387e3
++---
++ LICENSE | 6 +++---
++ docs/copyright.rst | 19 ++++++++++---------
++ 2 files changed, 13 insertions(+), 12 deletions(-)
++
++diff --git a/LICENSE b/LICENSE
++index aeb3da0..130ab40 100644
++--- a/LICENSE
+++++ b/LICENSE
++@@ -39,9 +39,9 @@ Documentation License
++
++ The documentation portion of Celery (the rendered contents of the
++ "docs" directory of a software distribution or checkout) is supplied
++-under the Creative Commons Attribution-Noncommercial-Share Alike 3.0
++-United States License as described by
++-http://creativecommons.org/licenses/by-nc-sa/3.0/us/
+++under the "Creative Commons Attribution-ShareAlike 4.0
+++International" (CC BY-SA 4.0) License as described by
+++http://creativecommons.org/licenses/by-sa/4.0/
++
++ Footnotes
++ =========
++diff --git a/docs/copyright.rst b/docs/copyright.rst
++index bfffb30..ba1c30c 100644
++--- a/docs/copyright.rst
+++++ b/docs/copyright.rst
++@@ -11,17 +11,18 @@ Copyright |copy| 2009-2014, Ask Solem.
++
++ All rights reserved. This material may be copied or distributed only
++ subject to the terms and conditions set forth in the `Creative Commons
++-Attribution-Noncommercial-Share Alike 3.0 United States License
++-<http://creativecommons.org/licenses/by-nc-sa/3.0/us/>`_. You must
++-give the original author credit. You may not use this work for
++-commercial purposes. If you alter, transform, or build upon this
++-work, you may distribute the resulting work only under the same or
++-similar license to this one.
+++Attribution-ShareAlike 4.0 International`
+++<http://creativecommons.org/licenses/by-nc-sa/3.0/us/>`_ license.
+++
+++You may share and adapt the material, even for commercial purposes, but
+++you must give the original author credit.
+++If you alter, transform, or build upon this
+++work, you may distribute the resulting work only under the same license or
+++a license compatible to this one.
++
++ .. note::
++
++ While the *Celery* documentation is offered under the
++- Creative Commons *attribution-nonconmmercial-share alike 3.0 united
++- states* license, the Celery *software* is offered under the
++- less restrictive
+++ Creative Commons *Attribution-ShareAlike 4.0 International* license
+++ the Celery *software* is offered under the
++ `BSD License (3 Clause) <http://www.opensource.org/licenses/BSD-3-Clause>`_
diff --cc debian/patches/disable_unstable_tests.patch
index 2d6cc8e,0000000..7bb0df2
mode 100644,000000..100644
--- a/debian/patches/disable_unstable_tests.patch
+++ b/debian/patches/disable_unstable_tests.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 730271e5e93ddb62fd758c28760a71acbf822cd4 Mon Sep 17 00:00:00 2001
++From cbc6f0026f8e7cd0c24c37f15b1e50e13d4889ec Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:37:04 -0700
+Subject: Disable time-sensitive test
+
+ Upstream has admited that this single test
+ (test_receieve_message_eta_isoformat) fails randomly. Disabling it by raising
+ a SkipTest exception.
+Forwarded: no
+Bug: https://github.com/celery/celery/issues/1450
+
+Patch-Name: disable_unstable_tests.patch
+---
+ celery/tests/worker/test_worker.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/celery/tests/worker/test_worker.py b/celery/tests/worker/test_worker.py
+index b700a6c..27451d0 100644
+--- a/celery/tests/worker/test_worker.py
++++ b/celery/tests/worker/test_worker.py
+@@ -416,6 +416,7 @@ class test_Consumer(AppCase):
+ self.assertIs(self.buffer.get_nowait(), task)
+
+ def test_receieve_message_eta_isoformat(self):
++ raise SkipTest('broken test, may fail at random')
+ l = _MyKombuConsumer(self.buffer.put, timer=self.timer, app=self.app)
+ l.blueprint.state = RUN
+ l.steps.pop()
+@@ -516,6 +517,7 @@ class test_Consumer(AppCase):
+ self.assertTrue(logger.critical.call_count)
+
+ def test_receive_message_eta(self):
++ raise SkipTest('broken test, may fail at random')
+ import sys
+ from functools import partial
+ if os.environ.get('C_DEBUG_TEST'):
diff --cc debian/patches/drop_downgrade.patch
index 9a9e8d8,0000000..35dcac0
mode 100644,000000..100644
--- a/debian/patches/drop_downgrade.patch
+++ b/debian/patches/drop_downgrade.patch
@@@ -1,58 -1,0 +1,58 @@@
- From f4b413933cd75827c32877c1fe70596584d9bd32 Mon Sep 17 00:00:00 2001
++From cd840962cd287350d34263441ea2bbb608330c4d Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:37:01 -0700
+Subject: Remove upstream detection of installed celery
+
+ Upstream tries to detect already installed versions of celery.app in order to
+ remove the whole directory. This leads to ImportErrors during the tests.
+Last-Update: 2013-09-03
+Forwarded: no
+
+Patch-Name: drop_downgrade.patch
+---
+ setup.py | 32 --------------------------------
+ 1 file changed, 32 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index 24ed037..0352b14 100644
++index 4ba98eb..a4c2729 100644
+--- a/setup.py
++++ b/setup.py
- @@ -22,38 +22,6 @@ CELERY_COMPAT_PROGRAMS = int(os.environ.get('CELERY_COMPAT_PROGRAMS', 1))
++@@ -23,38 +23,6 @@ CELERY_COMPAT_PROGRAMS = int(os.environ.get('CELERY_COMPAT_PROGRAMS', 1))
+ if sys.version_info < (2, 6):
+ raise Exception('Celery 3.1 requires Python 2.6 or higher.')
+
+-downgrade_packages = [
+- 'celery.app.task',
+-]
+-orig_path = sys.path[:]
+-for path in (os.path.curdir, os.getcwd()):
+- if path in sys.path:
+- sys.path.remove(path)
+-try:
+- import imp
+- import shutil
+- for pkg in downgrade_packages:
+- try:
+- parent, module = pkg.rsplit('.', 1)
+- print('- Trying to upgrade %r in %r' % (module, parent))
+- parent_mod = __import__(parent, None, None, [parent])
+- _, mod_path, _ = imp.find_module(module, parent_mod.__path__)
+- if mod_path.endswith('/' + module):
+- print('- force upgrading previous installation')
+- print(' - removing {0!r} package...'.format(mod_path))
+- try:
+- shutil.rmtree(os.path.abspath(mod_path))
+- except Exception:
+- sys.stderr.write('Could not remove {0!r}: {1!r}\n'.format(
+- mod_path, sys.exc_info[1]))
+- except ImportError:
+- print('- upgrade %s: no old version found.' % module)
+-except:
+- pass
+-finally:
+- sys.path[:] = orig_path
+-
+-
+ NAME = 'celery'
+ entrypoints = {}
+ extra = {}
diff --cc debian/patches/intersphinx.patch
index a6dd8ca,0000000..624e108
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,52 -1,0 +1,52 @@@
- From c64fccf360596574dc67f36da2d83b319f6d6e8b Mon Sep 17 00:00:00 2001
++From 85c83417637abeb0000bae48d84f63ff28692a5b Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:37:03 -0700
+Subject: use local objects.inv where possible
+
+ Upstream uses intersphinx mappings that fetch the objects.inv for python,
+ kombu and django-celery by HTTP from a remote host. Using the local
+ objects.inv from python and kombu enables the package to build without
+ network connection.
+Forwarded: not-needed
+Last-Update: 2011-12-27
+
+Patch-Name: intersphinx.patch
+---
+ docs/conf.py | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 0cbda73..caa3215 100644
++index 815819e..c7f62f7 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -75,13 +75,23 @@ exclude_trees = ['.build']
++@@ -75,13 +75,23 @@ unused_docs = [
+ # If true, '()' will be appended to :func: etc. cross-reference text.
+ add_function_parentheses = True
+
+-intersphinx_mapping = {
+- 'python': ('http://docs.python.org/dev', None),
+- 'kombu': ('http://kombu.readthedocs.org/en/latest/', None),
+- 'djcelery': ('http://django-celery.readthedocs.org/en/latest', None),
+- 'cyme': ('http://cyme.readthedocs.org/en/latest', None),
+- 'amqp': ('http://amqp.readthedocs.org/en/latest', None),
+-}
++def check_object_path(key, url, path):
++ if os.path.isfile(path):
++ return {key: (url, path)}
++ return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(check_object_path('python',
++ 'http://docs.python.org/',
++ '/usr/share/doc/python'
++ + '.'.join([str(x) for x in sys.version_info[0:2]])
++ + '/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('kombu',
++ 'http://kombu.readthedocs.org/en/latest/',
++ '/usr/share/doc/python-kombu-doc/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('amqp',
++ 'http://amqp.readthedocs.org/en/latest/',
++ '/usr/share/doc/python-amqp-doc/html/objects.inv'))
+
+ # The name of the Pygments (syntax highlighting) style to use.
+ pygments_style = 'colorful'
diff --cc debian/patches/lsb-init.patch
index bec70d6,0000000..ba2e97f
mode 100644,000000..100644
--- a/debian/patches/lsb-init.patch
+++ b/debian/patches/lsb-init.patch
@@@ -1,102 -1,0 +1,102 @@@
- From 4edf9235d78a38342d2a7a6d898dd046309d58cb Mon Sep 17 00:00:00 2001
++From 0e7ca21f39a76cc231dbc37e9aaeb10d3cc6e428 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:37:02 -0700
+Subject: LSB compliant headers, status actions and ENABLED variable
+
+ Upstream ships it's own init scripts but they lack some LSB header and
+ the (optional) "status" action. This patch fixes this and also adds a
+ variable called ENABLED in /etc/default/celeryd.
+Last-Update: 2013-09-03
+Forwarded: no
+
+Patch-Name: lsb-init.patch
+---
+ extra/generic-init.d/celerybeat | 12 ++++++++++++
+ extra/generic-init.d/celeryd | 11 +++++++++++
+ 2 files changed, 23 insertions(+)
+
+diff --git a/extra/generic-init.d/celerybeat b/extra/generic-init.d/celerybeat
+index fb31ca2..08bfbe4 100755
+--- a/extra/generic-init.d/celerybeat
++++ b/extra/generic-init.d/celerybeat
+@@ -15,11 +15,15 @@
+ # Default-Start: 2 3 4 5
+ # Default-Stop: 0 1 6
+ # Short-Description: celery periodic task scheduler
++# Description: Controls the Celery periodic task scheduler.
+ ### END INIT INFO
+
+ # Cannot use set -e/bash -e since the kill -0 command will abort
+ # abnormally in the absence of a valid process ID.
+ #set -e
++
++. /lib/lsb/init-functions
++
+ VERSION=10.1
+ echo "celery init v${VERSION}."
+
+@@ -85,6 +89,7 @@ _config_sanity() {
+
+ scripts=""
+
++
+ if test -f /etc/default/celeryd; then
+ scripts="/etc/default/celeryd"
+ _config_sanity /etc/default/celeryd
+@@ -106,6 +111,13 @@ DEFAULT_PID_FILE="/var/run/celery/beat.pid"
+ DEFAULT_LOG_FILE="/var/log/celery/beat.log"
+ DEFAULT_LOG_LEVEL="INFO"
+ DEFAULT_CELERYBEAT="$CELERY_BIN beat"
++DEFAULT_ENABLED="false"
++
++ENABLED=${ENABLED:-$DEFAULT_ENABLED}
++if [ "$ENABLED" != "true" ]; then
++ echo "celerybeat daemon disabled - see $scripts."
++ exit 0
++fi
+
+ CELERYBEAT=${CELERYBEAT:-$DEFAULT_CELERYBEAT}
+ CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-${CELERYBEAT_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
+diff --git a/extra/generic-init.d/celeryd b/extra/generic-init.d/celeryd
+index 8cef473..509e639 100755
+--- a/extra/generic-init.d/celeryd
++++ b/extra/generic-init.d/celeryd
+@@ -16,6 +16,7 @@
+ # Default-Start: 2 3 4 5
+ # Default-Stop: 0 1 6
+ # Short-Description: celery task worker daemon
++# Description: Controls a celery task worker daemon instance
+ ### END INIT INFO
+ #
+ #
+@@ -28,6 +29,9 @@
+ #
+ # You can then configure this by manipulating /etc/default/little-worker.
+ #
++
++. /lib/lsb/init-functions
++
+ VERSION=10.1
+ echo "celery init v${VERSION}."
+ if [ $(id -u) -ne 0 ]; then
+@@ -52,6 +56,7 @@ DEFAULT_LOG_FILE="/var/log/celery/%n.log"
+ DEFAULT_LOG_LEVEL="INFO"
+ DEFAULT_NODES="celery"
+ DEFAULT_CELERYD="-m celery worker --detach"
++DEFAULT_ENABLED="false"
+
+ CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/${SCRIPT_NAME}"}
+
+@@ -104,6 +109,12 @@ if [ -f "$CELERY_DEFAULTS" ]; then
+ . "$CELERY_DEFAULTS"
+ fi
+
++ENABLED=${ENABLED:-$DEFAULT_ENABLED}
++if [ "$ENABLED" != "true" ]; then
++ echo "celery daemon disabled - see $CELERY_DEFAULTS"
++ exit 0
++fi
++
+ # Sets --app argument for CELERY_BIN
+ CELERY_APP_ARG=""
+ if [ ! -z "$CELERY_APP" ]; then
diff --cc debian/patches/privacy.patch
index bfc9edb,0000000..16968f7
mode 100644,000000..100644
--- a/debian/patches/privacy.patch
+++ b/debian/patches/privacy.patch
@@@ -1,63 -1,0 +1,63 @@@
- From dcf207229b48d2e5e43fd4b31091d46b143b3b33 Mon Sep 17 00:00:00 2001
++From 24f878e9b31b88f9b27d15b4075f0d5b6bbaaf9e Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:37:05 -0700
+Subject: Remove external assets from documentation.
+
+ Upstream incldues a PayPal donation form in it's sphinx templates for which the
+ submit button used an external image and which was replaced by a simple
+ <button/> element. Also a gittip button is loaded inside an <iframe/> which is
+ removed. The logo image was loaded from the project website and is replaced
+ with the local image file.
+Last-Update: 2014-02-11
+Forwarded: not-needed
+
+Patch-Name: privacy.patch
+---
+ docs/.templates/sidebarintro.html | 8 ++------
+ docs/.templates/sidebarlogo.html | 8 ++------
+ 2 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/docs/.templates/sidebarintro.html b/docs/.templates/sidebarintro.html
+index 16cca54..1fd55b3 100644
+--- a/docs/.templates/sidebarintro.html
++++ b/docs/.templates/sidebarintro.html
+@@ -1,5 +1,5 @@
+ <p class="logo"><a href="{{ pathto(master_doc) }}">
+- <img class="logo" src="http://cloud.github.com/downloads/celery/celery/celery_128.png" alt="Logo"/>
++ <img class="logo" src="{{ pathto("_images/celery_128.png", 1) }}" alt="Logo"/>
+ </a></p>
+ <div id="donate">
+ <b>Please donate:</b>
+@@ -7,9 +7,5 @@
+ <input type="hidden" name="cmd" value="_s-xclick">
+ <input type="hidden" name="hosted_button_id" value="BPCLP83DFF2N2">
+ </form>
+- <img onclick="$('#paypal_donate').submit();"
+- src="http://celeryproject.org/static/img/icon-paypal.png" alt="amex">
+- <iframe style="border: 0; margin: 0; padding: 0;"
+- src="https://www.gittip.com/ask/widget.html"
+- width="48pt" height="22pt"> </iframe>
++ <button onclick="$('#paypal_donate').submit();" alt="PayPal">PayPal</button>
+ </div>
+diff --git a/docs/.templates/sidebarlogo.html b/docs/.templates/sidebarlogo.html
+index 16cca54..1fd55b3 100644
+--- a/docs/.templates/sidebarlogo.html
++++ b/docs/.templates/sidebarlogo.html
+@@ -1,5 +1,5 @@
+ <p class="logo"><a href="{{ pathto(master_doc) }}">
+- <img class="logo" src="http://cloud.github.com/downloads/celery/celery/celery_128.png" alt="Logo"/>
++ <img class="logo" src="{{ pathto("_images/celery_128.png", 1) }}" alt="Logo"/>
+ </a></p>
+ <div id="donate">
+ <b>Please donate:</b>
+@@ -7,9 +7,5 @@
+ <input type="hidden" name="cmd" value="_s-xclick">
+ <input type="hidden" name="hosted_button_id" value="BPCLP83DFF2N2">
+ </form>
+- <img onclick="$('#paypal_donate').submit();"
+- src="http://celeryproject.org/static/img/icon-paypal.png" alt="amex">
+- <iframe style="border: 0; margin: 0; padding: 0;"
+- src="https://www.gittip.com/ask/widget.html"
+- width="48pt" height="22pt"> </iframe>
++ <button onclick="$('#paypal_donate').submit();" alt="PayPal">PayPal</button>
+ </div>
diff --cc debian/patches/series
index 2c95adb,0000000..715f9fb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,7 @@@
+drop_downgrade.patch
+lsb-init.patch
+intersphinx.patch
+disable_unstable_tests.patch
+privacy.patch
- fix_test_typos.patch
- 0007-Improve-the-magic-module-check-Closes-801640.patch
- 0008-ci-Tests-passing-on-Python-3.5.patch
++0006-ci-Tests-passing-on-Python-3.5.patch
++0007-Update-license.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/celery.git
More information about the Python-modules-commits
mailing list