Merge ~lvoytek/ubuntu/+source/django-assets:fix-django4-compatibility into ubuntu/+source/django-assets:ubuntu/devel

[Lena Voytek]

Make django-assets compatible with Django 4.2 and fix build failures

django4-compatibility.patch comes from a merge request upstream that updates requires_system_checks to an empty array rather than False as boolean compatibility was removed in Django 4

01-webassets_version.patch is removed since upstream added the >= in __init__.py, meaning having it would lead to the error:
error in django-assets setup command: 'install_requires' must be a string or list of strings containing valid project/version requirement specifiers; Expected end or semicolon (after name and no valid version specifier)
    webassets>=>=2.0

fix-node-iteration.patch Fixes the error:
TypeError: 'TextNode' object is not iterable
I created this patch myself and sent the fix upstream - https://github.com/miracle2k/django-assets/pull/105

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/django-4-mantic

[Graham Inggs (ginggs)]

Looks good to me!

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ginggs, lvoytek
Uploaders: ginggs
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index d5483f5..37c5beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+django-assets (2.0-2.1ubuntu1) mantic; urgency=medium
+
+  * d/p/django4-compatibility.patch: Fix Django 4 compatibility by updating the
+    deprecated field requires_system_checks (LP: #2022089)
+  * d/p/fix-node-iteration.patch: Fix TypeError when iterating over Nodes
+  * d/p/01-webassets_version.patch: Remove - fixed upstream through __init__.py
+
+ -- Lena Voytek <[e-mail]>  Mon, 31 Jul 2023 12:07:24 -0700
+
 django-assets (2.0-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index ae19f0b..00cd2fe 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: django-assets
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders:
  Michael Fladischer <[e-mail]>,
  Chris Lamb <[e-mail]>,
diff --git a/debian/patches/01-webassets_version.patch b/debian/patches/01-webassets_version.patch
deleted file mode 100644
index e6aa376..0000000
--- a/debian/patches/01-webassets_version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Mcihael Fladischer <[e-mail]>
-Date: Thu, 8 Oct 2015 08:49:20 -0700
-Subject: loosen up dependency on webassets
-
- Upstream uses a strict versioned dependency on webassets-library which is
- unnecessary. This patch loosens up this dependency to also allow newer versions
- of webassets.
-Last-Update: 2014-09-09
-Forwarded: no
-
-Patch-Name: 01-webassets_version.patch
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 206458a..07a9ca0 100755
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,7 @@ setup(
-     platforms='any',
-     install_requires=[
-         'Django>=1.7',
--        'webassets%s' % webassets_version
-+        'webassets>=%s' % webassets_version
-         ],
-     classifiers=[
-         'Environment :: Web Environment',
diff --git a/debian/patches/django4-compatibility.patch b/debian/patches/django4-compatibility.patch
new file mode 100644
index 0000000..ea8fb10
--- /dev/null
+++ b/debian/patches/django4-compatibility.patch
@@ -0,0 +1,21 @@
+Description: Fix depricated field to build django-assets against Django 4.2
+ In Django 4 the requires_system_checks variable must now be a list or tuple,
+ as support for boolean values was removed. This patch replaces the False value
+ with an equivalent empty array. See https://code.djangoproject.com/ticket/33896
+Author: Madison Swain-Bowden <[e-mail]>
+Origin: other, https://github.com/miracle2k/django-assets/pull/103/commits/bc85445e31acbdbf86deff62255175da72a8ea13
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/django-assets/+bug/2022089
+Last-Update: 2023-07-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/django_assets/management/commands/assets.py
++++ b/django_assets/management/commands/assets.py
+@@ -37,7 +37,7 @@
+ 
+ class Command(BaseCommand):
+     help = 'Manage assets.'
+-    requires_system_checks = False
++    requires_system_checks = []
+ 
+     def add_arguments(self, parser):
+         # parser.add_argument('poll_id', nargs='+', type=str)
diff --git a/debian/patches/fix-node-iteration.patch b/debian/patches/fix-node-iteration.patch
new file mode 100644
index 0000000..01531b5
--- /dev/null
+++ b/debian/patches/fix-node-iteration.patch
@@ -0,0 +1,22 @@
+Description: Fix Node iteration error due to unsupported __iter__ function
+ When iterating over Template and Node objects directly, nodes may fail with an
+ exception such as: TypeError: 'TextNode' object is not iterable
+ This is due to iterating over nodes being unsupported in Django, as noted in
+ https://code.djangoproject.com/ticket/7430
+ To avoid this error, explicitly iterate over the nodelist attribute, rather
+ than relying on __iter__.
+Author: Lena Voytek <[e-mail]>
+Origin: backport, https://github.com/miracle2k/django-assets/pull/105/commits/af2440a107df0eac310cf3585b9f267ebe59f3dc
+Last-Update: 2023-08-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/django_assets/loaders.py
++++ b/django_assets/loaders.py
+@@ -107,6 +107,6 @@
+                     and node.nodelist\
+                     or []:
+                         _recurse_node(subnode)
+-            for node in t:  # don't move into _recurse_node, ``Template`` has a .nodelist attribute
++            for node in t.nodelist:  # don't move into _recurse_node, ``Template`` has a .nodelist attribute
+                 _recurse_node(node)
+             return result
diff --git a/debian/patches/series b/debian/patches/series
index e2d6a99..73abe40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-01-webassets_version.patch
 02-intersphinx.patch
 0003-Patch-pytest-plugin-to-check-whether-we-are-running-.patch
 0001-Global-regex-flags-must-be-at-the-start-of-regex-in-.patch
+django4-compatibility.patch
+fix-node-iteration.patch