[Python-modules-team] Bug#828642: Proposed NMU: fix FTBFS in Django 1.10
Thomas Goirand
zigo at debian.org
Mon Aug 8 09:01:07 UTC 2016
Hi,
Attached is the debdiff for the proposed upload, which I also pushed to
the DPMT git. I am uploading this fix to the DELAYED/2 queue. Let me
know if you oppose to the upload, so I can dcut the uploaded version
before it reaches the archive.
Cheers,
Thomas Goirand (zigo)
-------------- next part --------------
diff -Nru django-celery-3.1.17/debian/changelog django-celery-3.1.17/debian/changelog
--- django-celery-3.1.17/debian/changelog 2016-01-09 07:33:29.000000000 +0000
+++ django-celery-3.1.17/debian/changelog 2016-08-02 22:31:30.000000000 +0000
@@ -1,3 +1,13 @@
+django-celery (3.1.17-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add Django 1.10 patches to fix FTBFS (Closes: #828642):
+ - 0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch
+ - 0009-django-1.10-fix-access-to-_default_manager.patch
+ * Standards-Version: 3.9.8 (no change).
+
+ -- Thomas Goirand <zigo at debian.org> Tue, 02 Aug 2016 22:31:30 +0000
+
django-celery (3.1.17-3) unstable; urgency=medium
* Apply patches for Django 1.9 compatibility. Closes: #809568.
diff -Nru django-celery-3.1.17/debian/control django-celery-3.1.17/debian/control
--- django-celery-3.1.17/debian/control 2016-01-09 07:24:25.000000000 +0000
+++ django-celery-3.1.17/debian/control 2016-08-02 22:31:30.000000000 +0000
@@ -26,9 +26,9 @@
python3-mock,
python3-setuptools,
python3-tz
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/django-celery.git
-Vcs-Git: git://anonscm.debian.org/python-modules/packages/django-celery.git
+Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/django-celery.git
Homepage: http://celeryproject.org/
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.3
diff -Nru django-celery-3.1.17/debian/.git-dpm django-celery-3.1.17/debian/.git-dpm
--- django-celery-3.1.17/debian/.git-dpm 2016-01-09 07:24:26.000000000 +0000
+++ django-celery-3.1.17/debian/.git-dpm 2016-08-02 22:31:30.000000000 +0000
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-b1488a7aaa79825d44219d52c104011bc100d81f
-b1488a7aaa79825d44219d52c104011bc100d81f
+39098cc288ef5f15f9f52a83339a5d3bc59ba6cd
+39098cc288ef5f15f9f52a83339a5d3bc59ba6cd
58751dd4216a267ccad1f8b5932487c51af036e4
58751dd4216a267ccad1f8b5932487c51af036e4
django-celery_3.1.17.orig.tar.gz
diff -Nru django-celery-3.1.17/debian/patches/0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch django-celery-3.1.17/debian/patches/0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch
--- django-celery-3.1.17/debian/patches/0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch 1970-01-01 00:00:00.000000000 +0000
+++ django-celery-3.1.17/debian/patches/0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch 2016-08-02 22:31:30.000000000 +0000
@@ -0,0 +1,68 @@
+From 36d40e547b095a2979da7ef5883d84ea90a48cdf Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Tue, 2 Aug 2016 22:30:22 +0000
+Subject: django 1.10 fix django.conf.urls.patterns() is removed
+
+---
+ djcelery/urls.py | 10 +++-------
+ tests/urls.py | 12 +++---------
+ 2 files changed, 6 insertions(+), 16 deletions(-)
+
+diff --git a/djcelery/urls.py b/djcelery/urls.py
+index b6e5cad..2178bdd 100644
+--- a/djcelery/urls.py
++++ b/djcelery/urls.py
+@@ -13,20 +13,16 @@ URLs defined for celery.
+ """
+ from __future__ import absolute_import, unicode_literals
+
+-try:
+- from django.conf.urls import patterns, url
+-except ImportError: # deprecated since Django 1.4
+- from django.conf.urls.defaults import patterns, url # noqa
++from django.conf.urls import url
+
+ from . import views
+
+ task_pattern = r'(?P<task_id>[\w\d\-\.]+)'
+
+-urlpatterns = patterns(
+- '',
++urlpatterns = [
+ url(r'^%s/done/?$' % task_pattern, views.is_task_successful,
+ name='celery-is_task_successful'),
+ url(r'^%s/status/?$' % task_pattern, views.task_status,
+ name='celery-task_status'),
+ url(r'^tasks/?$', views.registered_tasks, name='celery-tasks'),
+-)
++]
+diff --git a/tests/urls.py b/tests/urls.py
+index 9d72f70..b8ab1c4 100644
+--- a/tests/urls.py
++++ b/tests/urls.py
+@@ -1,17 +1,11 @@
+-try:
+- from django.conf.urls import (patterns, include, url,
+- handler500, handler404)
+-except ImportError:
+- from django.conf.urls.defaults import (patterns, include, url, # noqa
+- handler500, handler404)
++from django.conf.urls import (include, url, handler500, handler404)
+ from djcelery.views import apply
+
+ # Uncomment the next two lines to enable the admin:
+ # from django.contrib import admin
+ # admin.autodiscover()
+
+-urlpatterns = patterns(
+- '',
++urlpatterns = [
+ # Example:
+ # (r'^tests/', include('tests.foo.urls')),
+
+@@ -24,4 +18,4 @@ urlpatterns = patterns(
+ url(r'^apply/(?P<task_name>.+?)/', apply, name='celery-apply'),
+ url(r'^celery/', include('djcelery.urls')),
+
+-)
++]
diff -Nru django-celery-3.1.17/debian/patches/0009-django-1.10-fix-access-to-_default_manager.patch django-celery-3.1.17/debian/patches/0009-django-1.10-fix-access-to-_default_manager.patch
--- django-celery-3.1.17/debian/patches/0009-django-1.10-fix-access-to-_default_manager.patch 1970-01-01 00:00:00.000000000 +0000
+++ django-celery-3.1.17/debian/patches/0009-django-1.10-fix-access-to-_default_manager.patch 2016-08-02 22:31:30.000000000 +0000
@@ -0,0 +1,22 @@
+From 39098cc288ef5f15f9f52a83339a5d3bc59ba6cd Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Mon, 8 Aug 2016 08:52:08 +0000
+Subject: django 1.10: fix access to _default_manager
+
+---
+ djcelery/schedulers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/djcelery/schedulers.py b/djcelery/schedulers.py
+index c937743..acbc0dd 100644
+--- a/djcelery/schedulers.py
++++ b/djcelery/schedulers.py
+@@ -95,7 +95,7 @@ class ModelEntry(ScheduleEntry):
+ def save(self):
+ # Object may not be synchronized, so only
+ # change the fields we care about.
+- obj = self.model._default_manager.get(pk=self.model.pk)
++ obj = self.model._meta.default_manager.get(pk=self.model.pk)
+ for field in self.save_fields:
+ setattr(obj, field, getattr(self.model, field))
+ obj.last_run_at = make_aware(obj.last_run_at)
diff -Nru django-celery-3.1.17/debian/patches/series django-celery-3.1.17/debian/patches/series
--- django-celery-3.1.17/debian/patches/series 2016-01-09 07:24:26.000000000 +0000
+++ django-celery-3.1.17/debian/patches/series 2016-08-02 22:31:30.000000000 +0000
@@ -5,3 +5,5 @@
0005-Fix-python3-issues.patch
0006-Fix-caching-with-Django-1.9.patch
0007-Fix-get_model-with-Django-1.9.patch
+0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch
+0009-django-1.10-fix-access-to-_default_manager.patch
More information about the Python-modules-team
mailing list