[Python-modules-commits] [django-celery] 07/10: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Mon Oct 19 07:17:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to annotated tag debian/3.1.17-1
in repository django-celery.
commit 1e5b78a7b7a87e1d306111d18c386aceb92da576
Merge: 0e17863 7f2c5bf
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Mon Oct 19 08:55:19 2015 +0200
merge patched into master
AUTHORS | 1 +
Changelog | 31 ++
LICENSE | 4 +-
PKG-INFO | 4 +-
README | 2 +-
README.rst | 2 +-
debian/.git-dpm | 6 +-
debian/patches/fix_autodiscover.patch | 2 +-
debian/patches/fix_dependencies.patch | 8 +-
debian/patches/no-issues.patch | 6 +-
debian/patches/privacy.patch | 4 +-
django_celery.egg-info/PKG-INFO | 4 +-
django_celery.egg-info/SOURCES.txt | 8 +-
djcelery/__init__.py | 20 +-
djcelery/backends/cache.py | 2 +-
djcelery/compat.py | 17 +-
djcelery/management/base.py | 14 +-
djcelery/management/commands/celery.py | 6 +-
djcelery/management/commands/celerybeat.py | 6 +-
djcelery/management/commands/celerycam.py | 6 +-
djcelery/management/commands/celeryd.py | 6 +-
djcelery/management/commands/celerymon.py | 4 +-
djcelery/management/commands/djcelerymon.py | 6 +-
djcelery/migrations/0001_initial.py | 459 ++++++++++++---------
djcelery/migrations/__init__.py | 16 +
djcelery/models.py | 22 +-
djcelery/mon.py | 4 +-
djcelery/picklefield.py | 20 +-
djcelery/snapshot.py | 4 +-
.../0001_initial.py | 2 +-
.../0002_v25_changes.py | 0
.../0003_v26_changes.py | 0
.../0004_v30_changes.py | 0
.../{migrations => south_migrations}/__init__.py | 0
djcelery/tests/test_schedulers.py | 21 +-
djcelery/tests/test_snapshot.py | 11 +-
djcelery/utils.py | 16 +-
docs/_ext/applyxrefs.py | 2 -
docs/changelog.rst | 31 ++
docs/conf.py | 6 +-
docs/settings.py | 2 +-
extra/release/doc4allmods | 8 +-
setup.py | 11 +-
tests/settings.py | 6 +-
44 files changed, 501 insertions(+), 309 deletions(-)
diff --cc debian/.git-dpm
index 01e8c0f,0000000..c6273e0
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
- 509c91280462a363b1a84268444981afd16fabb3
- 509c91280462a363b1a84268444981afd16fabb3
- e274bb991504635ed11dcc3d2aa551c1150bba83
++7f2c5bfa8f90e6b4dd04102979695576b3881164
++7f2c5bfa8f90e6b4dd04102979695576b3881164
++58751dd4216a267ccad1f8b5932487c51af036e4
+58751dd4216a267ccad1f8b5932487c51af036e4
+django-celery_3.1.17.orig.tar.gz
+64ca723de395f66decb5563e037c094ed723e45b
+79615
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/fix_autodiscover.patch
index 8e142bd,0000000..b0a7e7e
mode 100644,000000..100644
--- a/debian/patches/fix_autodiscover.patch
+++ b/debian/patches/fix_autodiscover.patch
@@@ -1,72 -1,0 +1,72 @@@
- From ca4026d77c07d88cac6a18f70d086ddf664d6c0f Mon Sep 17 00:00:00 2001
++From f0efa969284b71245f1640d8e2687b58a5bec51d Mon Sep 17 00:00:00 2001
+From: Brian May <bam at debian.org>
+Date: Thu, 8 Oct 2015 08:50:27 -0700
+Subject: Fix_autodiscover for Django 1.7
+
+Bug-Vendor: https://github.com/celery/django-celery/issues/343
+Last-Update: 2014-04-01
+Patch-Name: fix_autodiscover.patch
+---
+ djcelery/loaders.py | 9 +++++++--
+ djcelery/tests/test_discovery.py | 22 ++++++++++++++++------
+ 2 files changed, 23 insertions(+), 8 deletions(-)
+
+diff --git a/djcelery/loaders.py b/djcelery/loaders.py
+index df0a668..c86455a 100644
+--- a/djcelery/loaders.py
++++ b/djcelery/loaders.py
+@@ -175,8 +175,13 @@ def autodiscover():
+ return
+ _RACE_PROTECTION = True
+ try:
+- return filter(None, [find_related_module(app, 'tasks')
+- for app in settings.INSTALLED_APPS])
++ if django.VERSION < (1, 7):
++ return filter(None, [find_related_module(app, 'tasks')
++ for app in settings.INSTALLED_APPS])
++ else:
++ from django.apps import apps
++ return filter(None, [find_related_module(app.name, 'tasks')
++ for app in apps.get_app_configs()])
+ finally:
+ _RACE_PROTECTION = False
+
+diff --git a/djcelery/tests/test_discovery.py b/djcelery/tests/test_discovery.py
+index 22ebb4e..3b17d6c 100644
+--- a/djcelery/tests/test_discovery.py
++++ b/djcelery/tests/test_discovery.py
+@@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals
+
+ import warnings
+
++import django
+ from django.conf import settings
+
+ from celery.registry import tasks
+@@ -25,11 +26,20 @@ class TestDiscovery(unittest.TestCase):
+ def test_discovery_with_broken(self):
+ warnings.resetwarnings()
+ if 'someapp' in settings.INSTALLED_APPS:
+- installed_apps = list(settings.INSTALLED_APPS)
+- settings.INSTALLED_APPS = installed_apps + ['xxxnot.aexist']
+- try:
++ if django.VERSION < (1, 7):
++ # Django < 1.7
++ installed_apps = list(settings.INSTALLED_APPS)
++ settings.INSTALLED_APPS = installed_apps + ['xxxnot.aexist']
++ try:
++ # we should get a warning when loading xxxnot.aexist
++ with warnings.catch_warnings(record=True) as log:
++ autodiscover()
++ self.assertTrue(log)
++ finally:
++ settings.INSTALLED_APPS = installed_apps
++ else:
++ # Django 1.7
+ with warnings.catch_warnings(record=True) as log:
++ # we should not get any warnings
+ autodiscover()
+- self.assertTrue(log)
+- finally:
+- settings.INSTALLED_APPS = installed_apps
++ self.assertEqual(log, [])
diff --cc debian/patches/fix_dependencies.patch
index c41c729,0000000..8c9ac22
mode 100644,000000..100644
--- a/debian/patches/fix_dependencies.patch
+++ b/debian/patches/fix_dependencies.patch
@@@ -1,63 -1,0 +1,63 @@@
- From 27b66f5f210ed75c6703c173205be64c979d9154 Mon Sep 17 00:00:00 2001
++From 8623ba181ad7bfcf6b82b8353ef2b20328b9076d Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:50:25 -0700
+Subject: Remove pretty-printing nose-cover3 from build.
+
+ nose-cover3 is not essential to the build-proccess and is not packaged
+ for Debian. Thus removing it from the sources.
+Forwarded: not-needed
+Last-Update: 2011-11-28
+Patch-Name: fix_dependencies.patch
+---
+ requirements/test.txt | 1 -
+ setup.py | 7 -------
+ tests/settings.py | 3 ---
+ 3 files changed, 11 deletions(-)
+
+diff --git a/requirements/test.txt b/requirements/test.txt
+index 9e63952..f2e10a0 100644
+--- a/requirements/test.txt
++++ b/requirements/test.txt
+@@ -1,7 +1,6 @@
+ unittest2>=0.4.0
+ coverage>=3.0
+ nose
+-nose-cover3
+ mock
+ django-nose
+ python-memcached
+diff --git a/setup.py b/setup.py
- index 01ca123..7c587d1 100755
++index 31ca26c..ce02fb7 100755
+--- a/setup.py
++++ b/setup.py
- @@ -146,16 +146,9 @@ class CIRunTests(RunTests):
++@@ -147,16 +147,9 @@ class CIRunTests(RunTests):
+ def extra_args(self):
+ toxinidir = os.environ.get('TOXINIDIR', '')
+ return [
+- '--with-coverage3',
+- '--cover3-xml',
+- '--cover3-xml-file=%s' % (
+- os.path.join(toxinidir, 'coverage.xml'), ),
+ '--with-xunit',
+ '--xunit-file=%s' % (
+ os.path.join(toxinidir, 'nosetests.xml'), ),
+- '--cover3-html',
+- '--cover3-html-dir=%s' % (
+- os.path.join(toxinidir, 'cover'), ),
+ ]
+
+
+diff --git a/tests/settings.py b/tests/settings.py
- index e92f476..fb51723 100644
++index 73b5d2e..9a52cb7 100644
+--- a/tests/settings.py
++++ b/tests/settings.py
+@@ -43,9 +43,6 @@ COVERAGE_EXCLUDE_MODULES = (
+ NOSE_ARGS = [
+ os.path.join(here, os.pardir, 'djcelery', 'tests'),
+ os.environ.get('NOSE_VERBOSE') and '--verbose' or '',
+- '--cover3-package=djcelery',
+- '--cover3-branch',
+- '--cover3-exclude=%s' % ','.join(COVERAGE_EXCLUDE_MODULES),
+ ]
+
+ BROKER_URL = 'amqp://'
diff --cc debian/patches/no-issues.patch
index 139b582,0000000..c11eee3
mode 100644,000000..100644
--- a/debian/patches/no-issues.patch
+++ b/debian/patches/no-issues.patch
@@@ -1,29 -1,0 +1,29 @@@
- From d2dbf15139c91a5e00f4ab9838a56984377fc0b5 Mon Sep 17 00:00:00 2001
++From a7d0ce1deda0699343099a02c25fe55dc98c010d Mon Sep 17 00:00:00 2001
+From: Evgeni Golov <evgeni at debian.org>
+Date: Thu, 8 Oct 2015 08:50:26 -0700
+Subject: Do not build issues if DEB_BUILD_ISSUES=disabled
+
+ Building the issues via sphinxcontrib.issuetracker requires
+ a network connection which is not available on Debian
+ buildds.
+Bug-Debian: http://bugs.debian.org/681379
+Patch-Name: no-issues.patch
+---
+ docs/conf.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index d0543d0..45ad86d 100644
++index fad2a07..7d12486 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -81,6 +81,7 @@ html_sidebars = {
+ }
+
- ### Issuetracker
++ # ## Issuetracker
+-issuetracker = 'github'
+-issuetracker_project = 'celery/django-celery'
+-issuetracker_issue_pattern = r'[Ii]ssue #(\d+)'
++if os.environ.get("DEB_BUILD_ISSUES", False) != "disabled":
++ issuetracker = 'github'
++ issuetracker_project = 'celery/django-celery'
++ issuetracker_issue_pattern = r'[Ii]ssue #(\d+)'
diff --cc debian/patches/privacy.patch
index 0b70972,0000000..69274e0
mode 100644,000000..100644
--- a/debian/patches/privacy.patch
+++ b/debian/patches/privacy.patch
@@@ -1,63 -1,0 +1,63 @@@
- From 509c91280462a363b1a84268444981afd16fabb3 Mon Sep 17 00:00:00 2001
++From 7f2c5bfa8f90e6b4dd04102979695576b3881164 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:50:28 -0700
+Subject: Remove remote hosted logo image from documentation
+
+ This is a potential breach of privacy for the user viewing the documentation
+ from his local filesystem.
+Forwarded: not-needed
+Last-Update: 2015-07-07
+Patch-Name: privacy.patch
+---
+ docs/.templates/sidebarlogo.html | 3 ---
+ docs/conf.py | 2 +-
+ docs/index.rst | 2 --
+ docs/introduction.rst | 2 --
+ 4 files changed, 1 insertion(+), 8 deletions(-)
+ delete mode 100644 docs/.templates/sidebarlogo.html
+
+diff --git a/docs/.templates/sidebarlogo.html b/docs/.templates/sidebarlogo.html
+deleted file mode 100644
+index 1dd18ab..0000000
+--- a/docs/.templates/sidebarlogo.html
++++ /dev/null
+@@ -1,3 +0,0 @@
+-<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"/>
+-</a></p>
+diff --git a/docs/conf.py b/docs/conf.py
- index 45ad86d..74966de 100644
++index 7d12486..c17d4e2 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -76,7 +76,7 @@ html_theme = 'celery'
+ html_theme_path = ['_theme']
+ html_sidebars = {
+ 'index': ['sidebarintro.html', 'sourcelink.html', 'searchbox.html'],
+- '**': ['sidebarlogo.html', 'localtoc.html', 'relations.html',
++ '**': ['localtoc.html', 'relations.html',
+ 'sourcelink.html', 'searchbox.html'],
+ }
+
+diff --git a/docs/index.rst b/docs/index.rst
+index 4a73a4e..0ecbb81 100644
+--- a/docs/index.rst
++++ b/docs/index.rst
+@@ -1,5 +1,3 @@
+-.. image:: http://cloud.github.com/downloads/ask/celery/celery_128.png
+-
+ ===============================
+ Celery Integration for Django
+ ===============================
+diff --git a/docs/introduction.rst b/docs/introduction.rst
+index f2ab2ea..533e1dd 100644
+--- a/docs/introduction.rst
++++ b/docs/introduction.rst
+@@ -2,8 +2,6 @@
+ django-celery - Celery Integration for Django
+ ===============================================
+
+-.. image:: http://cloud.github.com/downloads/celery/celery/celery_128.png
+-
+ :Version: 3.1.9
+ :Web: http://celeryproject.org/
+ :Download: http://pypi.python.org/pypi/django-celery/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-celery.git
More information about the Python-modules-commits
mailing list