Merge ~lvoytek/ubuntu/+source/django-mailman3:add-django4-support-mantic into ubuntu/+source/django-mailman3:ubuntu/devel

[Lena Voytek]

Adding Django 4.2 support to django-mailman3 for the transition to 4.2 in mantic

PPA building against 4.2: https://launchpad.net/~lvoytek/+archive/ubuntu/django-4-mantic
PPA building against 3.2 (currently in Ubuntu): https://launchpad.net/~lvoytek/+archive/ubuntu/django3-mantic

[Lucas Kanashiro (lucaskanashiro)]

Thanks for this MP Lena! There is a minor change I think we should apply in the patch's DEP-3 headers.

review: Needs Fixing

dc8b6a4... by Lena Voytek on 2023-08-02

  * d/p/django4-compatibility.patch: Add Django 4.2 compatibility
  (LP: #2022089)

[Lena Voytek (lvoytek)]

Thanks for the review Lucas! That's a good point, updated the header

[Lucas Kanashiro (lucaskanashiro)]

Thanks Lena! LGTM now, +1.

review: Approve

[Lena Voytek (lvoytek)]

Thanks! Would you be willing to sponsor this one? Unfortunately most django packages just belong to motu

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

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

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Sure, package uploaded:

Uploading django-mailman3_1.3.9-1ubuntu1.dsc
Uploading django-mailman3_1.3.9-1ubuntu1.debian.tar.xz
Uploading django-mailman3_1.3.9-1ubuntu1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 36eb645..e92bde8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+django-mailman3 (1.3.9-1ubuntu1) mantic; urgency=medium
+
+  * Add Django 4.2 compatibility (LP: #2022089)
+    - d/p/django4-compatibility.patch: Add Django 4.2 as a possible dependency
+      in setup.py and provide a tox environment for it
+    - d/control: Allow Django 4.2 as a dependency
+
+ -- Lena Voytek <[e-mail]>  Fri, 28 Jul 2023 13:10:51 -0700
+
 django-mailman3 (1.3.9-1) unstable; urgency=medium
 
   * New upstream release: 1.3.9
diff --git a/debian/control b/debian/control
index 2759b7e..02eef97 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: django-mailman3
-Maintainer: Debian Mailman Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Mailman Team <[e-mail]>
 Uploaders: Pierre-Elliott Bécue <[e-mail]>,
            Jonas Meurer <[e-mail]>
 Section: python
@@ -8,7 +9,7 @@ Build-Depends: debhelper-compat (= 13),
                dh-python,
                python3-all,
                python3-django (>= 2:3.2),
-               python3-django (<< 3:4.2),
+               python3-django (<< 3:4.3),
                python3-django-allauth,
                python3-django-compressor,
                python3-django-gravatar2,
diff --git a/debian/patches/django4-compatibility.patch b/debian/patches/django4-compatibility.patch
new file mode 100644
index 0000000..9e1e5cb
--- /dev/null
+++ b/debian/patches/django4-compatibility.patch
@@ -0,0 +1,38 @@
+Description: Mark Django versions 3.2 to 4.2 as compatible
+ This is a modified version of an upstream commit that ignores changes to the
+ README.rst and .gitlab-ci.yml files, only using changes relevant to tox and
+ setup.py.
+Author: Mark Sapiro <[e-mail]>
+Origin: backport, https://gitlab.com/mailman/django-mailman3/-/commit/583544cc5d79dc8e5b9f647bfadf8212a6f67451
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/django-mailman3/+bug/2022089
+Last-Update: 2023-07-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/setup.py
++++ b/setup.py
+@@ -38,7 +38,7 @@
+     packages=find_packages(),
+     include_package_data=True,
+     install_requires=[
+-        'django>=3.2,<4.2',
++        'django>=3.2,<4.3',
+         'mailmanclient>=3.3.3',
+         'django-allauth',
+         'django-gravatar2 >= 1.0.6',
+--- a/tox.ini
++++ b/tox.ini
+@@ -1,5 +1,5 @@
+ [tox]
+-envlist = py{37,38,39,310.311}-django{32,40,41,latest},lint
++envlist = py{37,38,39,310.311}-django{32,40,41,42,latest},lint
+ 
+ 
+ [testenv]
+@@ -10,6 +10,7 @@
+     django32: django>=3.2,<3.3
+     django40: django>=4.0,<4.1
+     django41: django>=4.1,<4.2
++    django42: django>=4.2,<4.3
+     pytest-django
+     djangolatest: https://github.com/django/django/archive/main.tar.gz
+     coverage: pytest-cov
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2c430ea
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+django4-compatibility.patch