[Python-modules-commits] [celery] 03/04: Update patches for 4.0.2
Brian May
bam at moszumanska.debian.org
Mon Jul 3 22:14:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch debian/master
in repository celery.
commit dc05f87a6062653009f91207804411baf36781b5
Author: Brian May <bam at debian.org>
Date: Tue Jul 4 08:05:39 2017 +1000
Update patches for 4.0.2
---
.../0006-ci-Tests-passing-on-Python-3.5.patch | 114 ---------------------
.../patches/0007-Set-shell-in-su-invocation.patch | 19 ++--
.../0008-Remove-bashisms-from-initd-scripts.patch | 53 ----------
debian/patches/disable_unstable_tests.patch | 36 -------
debian/patches/drop_downgrade.patch | 58 -----------
debian/patches/intersphinx.patch | 52 ----------
debian/patches/lsb-init.patch | 19 ++--
debian/patches/privacy.patch | 48 +++------
debian/patches/series | 5 -
9 files changed, 31 insertions(+), 373 deletions(-)
diff --git a/debian/patches/0006-ci-Tests-passing-on-Python-3.5.patch b/debian/patches/0006-ci-Tests-passing-on-Python-3.5.patch
deleted file mode 100644
index 9461e61..0000000
--- a/debian/patches/0006-ci-Tests-passing-on-Python-3.5.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 0026d0040dada5f52ab66d37baee8baf4e4d2e99 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 73f0d1d..ce112ac 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):
-@@ -68,6 +69,8 @@ class test_LRUCache(Case):
- self.assertEqual(list(x.keys()), [98, 99])
-
- 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 944a095..6d383e0 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:
-@@ -67,9 +67,7 @@ class LRUCache(UserDict):
- for _ in range(len(data) - limit):
- data.popitem(last=False)
-
-- 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)
-
-@@ -83,8 +81,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])
-@@ -92,8 +90,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]
-@@ -104,7 +102,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):
-@@ -113,7 +112,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 --git a/debian/patches/0007-Set-shell-in-su-invocation.patch b/debian/patches/0007-Set-shell-in-su-invocation.patch
index c5d3932..652e898 100644
--- a/debian/patches/0007-Set-shell-in-su-invocation.patch
+++ b/debian/patches/0007-Set-shell-in-su-invocation.patch
@@ -1,4 +1,3 @@
-From 8af58d646c13cbd52374f855d522f48b580b3089 Mon Sep 17 00:00:00 2001
From: Brian May <bam at debian.org>
Date: Wed, 25 May 2016 18:06:17 +1000
Subject: Set shell in su invocation
@@ -11,28 +10,28 @@ http://bugs.debian.org/824786
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/extra/generic-init.d/celerybeat b/extra/generic-init.d/celerybeat
-index b6287ad..78aa25a 100755
+index ee4c595..20d69a2 100755
--- a/extra/generic-init.d/celerybeat
+++ b/extra/generic-init.d/celerybeat
-@@ -249,7 +249,7 @@ stop_beat () {
- }
+@@ -261,7 +261,7 @@ stop_beat () {
_chuid () {
-- su "$CELERYBEAT_USER" -c "$CELERYBEAT $*"
-+ su "$CELERYBEAT_USER" --shell=/bin/sh -c "$CELERYBEAT $*"
+ ${CELERYBEAT_SU} ${CELERYBEAT_SU_ARGS} \
+- "$CELERYBEAT_USER" -c "$CELERYBEAT $*"
++ "$CELERYBEAT_USER" --shell=/bin/sh -c "$CELERYBEAT $*"
}
start_beat () {
diff --git a/extra/generic-init.d/celeryd b/extra/generic-init.d/celeryd
-index 6c2f866..7ad4599 100755
+index e7b5564..54dc536 100755
--- a/extra/generic-init.d/celeryd
+++ b/extra/generic-init.d/celeryd
-@@ -241,7 +241,7 @@ _get_pids() {
+@@ -257,7 +257,7 @@ _get_pids() {
_chuid () {
-- su "$CELERYD_USER" -c "$CELERYD_MULTI $*"
-+ su "$CELERYD_USER" --shell=/bin/sh -c "$CELERYD_MULTI $*"
+- ${CELERYD_SU} ${CELERYD_SU_ARGS} "$CELERYD_USER" -c "$CELERYD_MULTI $*"
++ ${CELERYD_SU} ${CELERYD_SU_ARGS} "$CELERYD_USER" --shell=/bin/sh -c "$CELERYD_MULTI $*"
}
diff --git a/debian/patches/0008-Remove-bashisms-from-initd-scripts.patch b/debian/patches/0008-Remove-bashisms-from-initd-scripts.patch
deleted file mode 100644
index c7b10ea..0000000
--- a/debian/patches/0008-Remove-bashisms-from-initd-scripts.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From fe0a322f110f182dc98d703815d17663fa5ac893 Mon Sep 17 00:00:00 2001
-From: Ask Solem <ask at celeryproject.org>
-Date: Mon, 23 May 2016 13:45:39 -0700
-Subject: Remove bashisms from initd scripts
-
-Patch from
-https://github.com/celery/celery/commit/44c0ebf9c46406988e5002f8a78aa2dd506451d6
----
- extra/generic-init.d/celerybeat | 9 +++++++--
- extra/generic-init.d/celeryd | 7 ++++++-
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/extra/generic-init.d/celerybeat b/extra/generic-init.d/celerybeat
-index 78aa25a..a1596a3 100755
---- a/extra/generic-init.d/celerybeat
-+++ b/extra/generic-init.d/celerybeat
-@@ -33,9 +33,14 @@ if [ $(id -u) -ne 0 ]; then
- exit 1
- fi
-
-+origin_is_runlevel_dir () {
-+ set +e
-+ dirname $0 | grep -q "/etc/rc.\.d"
-+ echo $?
-+}
-
--# May be a runlevel symlink (e.g. S02celeryd)
--if [ -L "$0" ]; then
-+# Can be a runlevel symlink (e.g. S02celeryd)
-+if [ $(origin_is_runlevel_dir) -eq 0 ]; then
- SCRIPT_FILE=$(readlink "$0")
- else
- SCRIPT_FILE="$0"
-diff --git a/extra/generic-init.d/celeryd b/extra/generic-init.d/celeryd
-index 7ad4599..d88e029 100755
---- a/extra/generic-init.d/celeryd
-+++ b/extra/generic-init.d/celeryd
-@@ -41,9 +41,14 @@ if [ $(id -u) -ne 0 ]; then
- exit 1
- fi
-
-+origin_is_runlevel_dir () {
-+ set +e
-+ dirname $0 | grep -q "/etc/rc.\.d"
-+ echo $?
-+}
-
- # Can be a runlevel symlink (e.g. S02celeryd)
--if [[ `dirname $0` == /etc/rc*.d ]]; then
-+if [ $(origin_is_runlevel_dir) -eq 0 ]; then
- SCRIPT_FILE=$(readlink "$0")
- else
- SCRIPT_FILE="$0"
diff --git a/debian/patches/disable_unstable_tests.patch b/debian/patches/disable_unstable_tests.patch
deleted file mode 100644
index 88f12ab..0000000
--- a/debian/patches/disable_unstable_tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 472b1f1fbf39b6bfb688636cd0eda7bba28cd708 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 --git a/debian/patches/drop_downgrade.patch b/debian/patches/drop_downgrade.patch
deleted file mode 100644
index 7224bb8..0000000
--- a/debian/patches/drop_downgrade.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 77606317078a5e1029eff0f522581b0250d6b38f 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 4ba98eb..a4c2729 100644
---- a/setup.py
-+++ b/setup.py
-@@ -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 --git a/debian/patches/intersphinx.patch b/debian/patches/intersphinx.patch
deleted file mode 100644
index e810cc0..0000000
--- a/debian/patches/intersphinx.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From fa042fe5c3a65d6d2eee7270d7c5c3cb413ef2ed 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 551e7a6..b2722d8 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -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 --git a/debian/patches/lsb-init.patch b/debian/patches/lsb-init.patch
index 905c086..42c1f44 100644
--- a/debian/patches/lsb-init.patch
+++ b/debian/patches/lsb-init.patch
@@ -1,4 +1,3 @@
-From d7b31c98abd087532b40df2eb9e4b81c0b13feb9 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
@@ -16,7 +15,7 @@ Patch-Name: lsb-init.patch
2 files changed, 23 insertions(+)
diff --git a/extra/generic-init.d/celerybeat b/extra/generic-init.d/celerybeat
-index 2db4e9a..b6287ad 100755
+index 08c815b..ee4c595 100755
--- a/extra/generic-init.d/celerybeat
+++ b/extra/generic-init.d/celerybeat
@@ -15,11 +15,15 @@
@@ -35,7 +34,7 @@ index 2db4e9a..b6287ad 100755
VERSION=10.1
echo "celery init v${VERSION}."
-@@ -85,6 +89,7 @@ _config_sanity() {
+@@ -90,6 +94,7 @@ _config_sanity() {
scripts=""
@@ -43,7 +42,7 @@ index 2db4e9a..b6287ad 100755
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"
+@@ -111,6 +116,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"
@@ -58,7 +57,7 @@ index 2db4e9a..b6287ad 100755
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 362383d..6c2f866 100755
+index de55414..e7b5564 100755
--- a/extra/generic-init.d/celeryd
+++ b/extra/generic-init.d/celeryd
@@ -16,6 +16,7 @@
@@ -69,7 +68,7 @@ index 362383d..6c2f866 100755
### END INIT INFO
#
#
-@@ -28,6 +29,9 @@
+@@ -27,6 +28,9 @@
#
# You can then configure this by manipulating /etc/default/little-worker.
#
@@ -79,15 +78,15 @@ index 362383d..6c2f866 100755
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"
+@@ -56,6 +60,7 @@ DEFAULT_LOG_FILE="/var/log/celery/%n%I.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
+ if [ -d "/etc/default" ]; then
+ CELERY_CONFIG_DIR="/etc/default"
+@@ -114,6 +119,12 @@ if [ -f "$CELERY_DEFAULTS" ]; then
. "$CELERY_DEFAULTS"
fi
diff --git a/debian/patches/privacy.patch b/debian/patches/privacy.patch
index 43b879e..0be1501 100644
--- a/debian/patches/privacy.patch
+++ b/debian/patches/privacy.patch
@@ -1,4 +1,3 @@
-From 77b58826e579af69989e924dfc5d3cd63a6effde 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.
@@ -13,21 +12,19 @@ Forwarded: not-needed
Patch-Name: privacy.patch
---
- docs/.templates/sidebarintro.html | 12 +-----------
- docs/.templates/sidebarlogo.html | 12 +-----------
- 2 files changed, 2 insertions(+), 22 deletions(-)
+ docs/_templates/sidebardonations.html | 11 -----------
+ 1 file changed, 11 deletions(-)
-diff --git a/docs/.templates/sidebarintro.html b/docs/.templates/sidebarintro.html
-index cc68b8f..f1e739c 100644
---- a/docs/.templates/sidebarintro.html
-+++ b/docs/.templates/sidebarintro.html
-@@ -1,13 +1,3 @@
- <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>Donations welcome:</b>
+diff --git a/docs/_templates/sidebardonations.html b/docs/_templates/sidebardonations.html
+index d6e6dfa..a4706fe 100644
+--- a/docs/_templates/sidebardonations.html
++++ b/docs/_templates/sidebardonations.html
+@@ -1,13 +1,2 @@
+-<iframe src="https://ghbtns.com/github-btn.html?user=celery&repo=celery&type=watch&count=true&size=large"
+- allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
+-</p>
+ <div id="donate">
+- <b>Please help support this community project with a donation:</b>
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
- <input type="hidden" name="cmd" value="_s-xclick">
- <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHTwYJKoZIhvcNAQcEoIIHQDCCBzwCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYA2+c723xlntHKQYQR9yn9BEtUhDoUUlnOqhniqvNMWB4k2R0JpVkrNSu5JCbdjNOqDXKHoRfIWe3HXJJMPZBJKFMD5Izprb6xEZlTGaWnlrGXFfkdBaILQQgWYqV0DnuNmtDXCvfYmyu0p1K04w [...]
@@ -35,23 +32,4 @@ index cc68b8f..f1e739c 100644
- <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
- <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
- </form>
--</div>
-diff --git a/docs/.templates/sidebarlogo.html b/docs/.templates/sidebarlogo.html
-index cc68b8f..f1e739c 100644
---- a/docs/.templates/sidebarlogo.html
-+++ b/docs/.templates/sidebarlogo.html
-@@ -1,13 +1,3 @@
- <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>Donations welcome:</b>
-- <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-- <input type="hidden" name="cmd" value="_s-xclick">
-- <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHTwYJKoZIhvcNAQcEoIIHQDCCBzwCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYA2+c723xlntHKQYQR9yn9BEtUhDoUUlnOqhniqvNMWB4k2R0JpVkrNSu5JCbdjNOqDXKHoRfIWe3HXJJMPZBJKFMD5Izprb6xEZlTGaWnlrGXFfkdBaILQQgWYqV0DnuNmtDXCvfYmyu0p1K04w [...]
-- ">
-- <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-- <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
-- </form>
--</div>
+ </div>
diff --git a/debian/patches/series b/debian/patches/series
index 4276c96..d617195 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
-drop_downgrade.patch
lsb-init.patch
-intersphinx.patch
-disable_unstable_tests.patch
privacy.patch
-0006-ci-Tests-passing-on-Python-3.5.patch
0007-Set-shell-in-su-invocation.patch
-0008-Remove-bashisms-from-initd-scripts.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