Merge ~lvoytek/ubuntu/+source/python-django-crispy-forms:django4-compatibility into ubuntu/+source/python-django-crispy-forms:ubuntu/devel

[Lena Voytek]

Fix test suite compatibility with Django 4 with upstream changes

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

Local autopkgtest results:

autopkgtest [13:29:06]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-tests PASS
qemu-system-x86_64: terminating on signal 15 from pid 51279 (/usr/bin/python3)

[Michał Małoszewski (michal-maloszewski99)]

LGTM, +1

[Lukas Märdian (slyon)]

Thank you very much!

This is a simple and clean patch, using proper DEP-3 headers and evidence was provided that the code had been properly tested (PPA build + local autopkgtests).

I confirmed the backported changes/logic matches the referenced upstream patch (https://github.com/django-crispy-forms/django-crispy-forms/commit/0d13c6c).

LGTM!

review: Approve

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

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

review: Approve

[Lukas Märdian (slyon)]

https://launchpad.net/ubuntu/+source/python-django-crispy-forms/1.14.0-4ubuntu1

diff --git a/debian/changelog b/debian/changelog
index 0686efb..63d4ca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-django-crispy-forms (1.14.0-4ubuntu1) mantic; urgency=medium
+
+  * d/p/support-django4.patch: Support Django 4.1 and 4.2 by overriding
+    template settings to fix template loading in the
+    keepcontext_context_manager test (LP: #2022089)
+
+ -- Lena Voytek <[e-mail]>  Thu, 31 Aug 2023 11:55:04 -0700
+
 python-django-crispy-forms (1.14.0-4) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index 1ed146f..a2d505a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: python-django-crispy-forms
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders:
  Jan Dittberner <[e-mail]>,
 Section: python
diff --git a/debian/patches/series b/debian/patches/series
index b9cf29e..39128dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 no-remote-resources.patch
 Sphinx-Correct-multi-line-definition-list.patch
 Sphinx-Adding-missing-blank-line-after-markup.patch
+support-django4.patch
diff --git a/debian/patches/support-django4.patch b/debian/patches/support-django4.patch
new file mode 100644
index 0000000..f5d6957
--- /dev/null
+++ b/debian/patches/support-django4.patch
@@ -0,0 +1,53 @@
+Description: Update keepcontext_context_manager test to support Django 4
+ To get the full django-crispy-forms test suite to work with Django 4, the
+ keepcontext_context_manager must be provided with overriden template
+ settings, since the default settings do not provide the necessary
+ filesystem and app_directories loaders. This patch is created from a
+ partial upstream commit, excluding CI, README, and setup.py changes.
+Author: David Smith <[e-mail]>
+Origin: backport, https://github.com/django-crispy-forms/django-crispy-forms/commit/0d13c6c9d326ba2690bc57da0aba7fd178b732a4
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-django-crispy-forms/+bug/2022089
+Forwarded: not-needed
+Last-Update: 2023-08-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/crispy_forms/tests/test_layout.py
++++ b/crispy_forms/tests/test_layout.py
+@@ -5,6 +5,7 @@
+ from django.middleware.csrf import _get_new_csrf_string
+ from django.shortcuts import render
+ from django.template import Context, Template
++from django.test.utils import override_settings
+ from django.urls import reverse
+ from django.utils.translation import gettext_lazy as _
+ 
+@@ -28,6 +29,7 @@
+     SampleForm6,
+     SelectSampleForm,
+ )
++from .test_settings import TEMPLATE_DIRS
+ from .utils import contains_partial, parse_expected, parse_form
+ 
+ 
+@@ -560,7 +562,20 @@
+     assert 'class="customdivs"' in html
+     assert 'test-markup="123"' in html
+ 
+-
++@override_settings(
++    TEMPLATES=[
++        {
++            "BACKEND": "django.template.backends.django.DjangoTemplates",
++            "DIRS": TEMPLATE_DIRS,
++            "OPTIONS": {
++                "loaders": [
++                    "django.template.loaders.filesystem.Loader",
++                    "django.template.loaders.app_directories.Loader",
++                ],
++            },
++        }
++    ]
++)
+ @only_bootstrap
+ def test_keepcontext_context_manager(settings):
+     # Test case for issue #180