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

[Lena Voytek]

Allow Django 4 as a build dependency for cachalot by removing upper version limit in d/control. This is how it was updated in Debian Salsa, but the newer version has yet to be uploaded - https://salsa.debian.org/python-team/packages/django-cachalot/-/blob/master/debian/control

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

[Sergio Durigan Junior (sergiodj)]

Thanks, Lena.

While looking at the upstream releases I noticed that the Django 4.0 support has been implemented in 2.4.5 (by https://github.com/noripyt/django-cachalot/pull/208). I couldn't find any backported patches to implement such support in the version we have in the archive. I see that the build passes against Django 4.0 with your proposed change, but are we sure that the package will work? I'm just trying to cover all bases before we go ahead and upload this MP. Thanks.

review: Needs Information

[Lena Voytek (lvoytek)]

Yeah the package should work with Django 4 as is. The upstream changes to fully support Django 4 are all related to github ci, tox, docs, and the testing framework. It would be nice to update the testing framework, especially if a DEP-8 test was created using it, but isn't necessary for building or running the package.

[Lena Voytek (lvoytek)]

Ah actually I forgot about autodep8, the test suite should actually be updated. I'll get that added

[Lena Voytek (lvoytek)]

Autodep8 was actually failing because the module name is cachalot rather than django_cachalot. So I overrode the test with the other name. That means the test suite fixes aren't actually needed. If another autopkgtest for upstream tests was created though then it would be needed. Here are the results now:

autopkgtest [11:32:38]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS (superficial)
qemu-system-x86_64: terminating on signal 15 from pid 57842 (/usr/bin/python3)

[Sergio Durigan Junior (sergiodj)]

Thanks, Lena.

Given your explanation that the package works with Django 4 as is, this LGTM.

Uploaded:

$ dput django-cachalot_2.4.3-2ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/django-cachalot/django-cachalot_2.4.3-2ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/django-cachalot/django-cachalot_2.4.3-2ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading django-cachalot_2.4.3-2ubuntu1.dsc: done.
  Uploading django-cachalot_2.4.3-2ubuntu1.debian.tar.xz: done.
  Uploading django-cachalot_2.4.3-2ubuntu1_source.buildinfo: done.
  Uploading django-cachalot_2.4.3-2ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

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

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

review: Approve

diff --git a/debian/changelog b/debian/changelog
index f80f036..48a4b95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+django-cachalot (2.4.3-2ubuntu1) mantic; urgency=medium
+
+  * d/control: Remove restriction on later Django versions, allowing 4.0+
+    (LP: #2022089)
+  * d/t/control: Replace autodep8 test, using cachalot as the module name
+    rather than django_cachalot
+
+ -- Lena Voytek <[e-mail]>  Fri, 25 Aug 2023 12:35:25 -0700
+
 django-cachalot (2.4.3-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 7ac6b6e..64bbd38 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: django-cachalot
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Dominik George <[e-mail]>
 Section: python
 Priority: optional
@@ -8,7 +9,6 @@ Build-Depends:
  dh-python,
  python3-all,
  python3-django (>= 2:2.2~),
- python3-django (<< 3:3.3~),
  python3-setuptools,
 Standards-Version: 4.6.0
 Homepage: https://github.com/noripyt/django-cachalot
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..47de517
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,5 @@
+Test-Command: for py in $(py3versions -r 2>/dev/null) ; do cd "$AUTOPKGTEST_TMP" ; echo "Testing with $py:" ; $py -c "import cachalot; print(cachalot)" ; done
+Depends:
+ python3-all,
+ @,
+Restrictions: superficial