Package: guix-patches;
Reported by: Nicolas Graves <ngraves <at> ngraves.fr>
Date: Tue, 5 Sep 2023 14:50:01 UTC
Severity: normal
Tags: patch
Message #71 received at 65758 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 65758 <at> debbugs.gnu.org Cc: ngraves <at> ngraves.fr Subject: [PATCH v6 22/55] gnu: python-django-tagging: Add patch for django <at> 4 support. Date: Tue, 5 Sep 2023 18:30:58 +0200
* gnu/packages/django.scm (python-django-tagging): Add patch for django <at> 4 support.
[source](patches): Add patch for django <at> 4 support.
[native-inputs]: Add tzdata-for-tests.
* gnu/packages/patches/python-django-tagging-django-4-support.patch
---
gnu/packages/django.scm | 7 +-
...thon-django-tagging-django-4-support.patch | 101 ++++++++++++++++++
2 files changed, 106 insertions(+), 2 deletions(-)
create mode 100644 gnu/packages/patches/python-django-tagging-django-4-support.patch
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index c689526a6d..b5830234b4 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1071,8 +1071,9 @@ (define-public python-django-tagging
(method url-fetch)
(uri (pypi-uri "django-tagging" version))
(sha256
- (base32
- "13afxx30chssclxzd9gqnvwm9qyrdpnlbs6iswdfa18phfj8zmi8"))))
+ (base32 "13afxx30chssclxzd9gqnvwm9qyrdpnlbs6iswdfa18phfj8zmi8"))
+ (patches
+ (search-patches "python-django-tagging-django-4-support.patch"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -1081,6 +1082,8 @@ (define-public python-django-tagging
(lambda _
(setenv "DJANGO_SETTINGS_MODULE" "tagging.tests.settings")
(invoke "django-admin" "test" "--pythonpath=."))))))
+ (native-inputs
+ (list tzdata-for-tests))
(inputs
(list python-django))
(home-page "https://github.com/Fantomas42/django-tagging")
diff --git a/gnu/packages/patches/python-django-tagging-django-4-support.patch b/gnu/packages/patches/python-django-tagging-django-4-support.patch
new file mode 100644
index 0000000000..bb51f072cf
--- /dev/null
+++ b/gnu/packages/patches/python-django-tagging-django-4-support.patch
@@ -0,0 +1,101 @@
+From ee42fd962c5abc7ed18f729ded42ee1f56397678 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?=
+ <bartolome.salado <at> kiwi.com>
+Date: Sun, 12 Dec 2021 18:13:23 +0100
+Subject: [PATCH 2/4] Use smart_str instead of deprecated smart_text Django
+ function
+
+---
+ tagging/models.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tagging/models.py b/tagging/models.py
+index 02550eec..d16a61ec 100644
+--- a/tagging/models.py
++++ b/tagging/models.py
+@@ -5,7 +5,7 @@
+ from django.contrib.contenttypes.models import ContentType
+ from django.db import connection
+ from django.db import models
+-from django.utils.encoding import smart_text
++from django.utils.encoding import smart_str
+ from django.utils.translation import gettext_lazy as _
+
+ from tagging import settings
+@@ -519,4 +519,4 @@ class Meta:
+ verbose_name_plural = _('tagged items')
+
+ def __str__(self):
+- return '%s [%s]' % (smart_text(self.object), smart_text(self.tag))
++ return '%s [%s]' % (smart_str(self.object), smart_str(self.tag))
+
+From 9c47683ec67ad2fbf82f1dce6384b156f64f55bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?=
+ <bartolome.salado <at> kiwi.com>
+Date: Sun, 12 Dec 2021 18:14:35 +0100
+Subject: [PATCH 3/4] Use re_path instead of deprecated url Django function
+
+---
+ tagging/tests/urls.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tagging/tests/urls.py b/tagging/tests/urls.py
+index aa127d5f..7db3e7e1 100644
+--- a/tagging/tests/urls.py
++++ b/tagging/tests/urls.py
+@@ -1,5 +1,5 @@
+ """Test urls for tagging."""
+-from django.conf.urls import url
++from django.urls import re_path
+
+ from tagging.tests.models import Article
+ from tagging.views import TaggedObjectList
+@@ -11,10 +11,10 @@ class StaticTaggedObjectList(TaggedObjectList):
+
+
+ urlpatterns = [
+- url(r'^static/$', StaticTaggedObjectList.as_view()),
+- url(r'^static/related/$', StaticTaggedObjectList.as_view(
++ re_path(r'^static/$', StaticTaggedObjectList.as_view()),
++ re_path(r'^static/related/$', StaticTaggedObjectList.as_view(
+ related_tags=True)),
+- url(r'^no-tag/$', TaggedObjectList.as_view(model=Article)),
+- url(r'^no-query-no-model/$', TaggedObjectList.as_view()),
+- url(r'^(?P<tag>[^/]+(?u))/$', TaggedObjectList.as_view(model=Article)),
++ re_path(r'^no-tag/$', TaggedObjectList.as_view(model=Article)),
++ re_path(r'^no-query-no-model/$', TaggedObjectList.as_view()),
++ re_path(r'^(?P<tag>[^/]+(?u))/$', TaggedObjectList.as_view(model=Article)),
+ ]
+
+From 6550f6c04c0d2d67049e8cc3263623811207c66d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?=
+ <bartolome.salado <at> kiwi.com>
+Date: Sun, 12 Dec 2021 18:26:03 +0100
+Subject: [PATCH 4/4] Add support for Django 4 compatibility
+
+---
+ tagging/models.py | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/tagging/models.py
++++ b/tagging/models.py
+@@ -5,6 +5,7 @@
+ from django.contrib.contenttypes.models import ContentType
+ from django.db import connection
+ from django.db import models
++from django.db.models.query_utils import Q
+ from django.utils.encoding import smart_str
+ from django.utils.translation import gettext_lazy as _
+
+@@ -155,8 +156,9 @@ def usage_for_model(self, model, counts=False, min_count=None,
+ filters = {}
+
+ queryset = model._default_manager.filter()
+- for f in filters.items():
+- queryset.query.add_filter(f)
++ for k, v in filters.items():
++ # Add support for both Django 4 and inferior versions
++ queryset.query.add_q(Q((k, v)))
+ usage = self.usage_for_queryset(queryset, counts, min_count)
+
+ return usage
--
2.41.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.