Merge ~lvoytek/ubuntu/+source/djangorestframework-filters:django4-compatibility into ubuntu/+source/djangorestframework-filters:ubuntu/devel

[Lena Voytek]

Fix test suite to work with Django 4.2, using re_path instead of url

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

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

LGTM, +1

[Sergio Durigan Junior (sergiodj)]

Thanks, Lena.

LGTM. Does it make sense to forward the patch to Debian/upstream?

Uploaded:

$ dput djangorestframework-filters_1.0.0.dev2-2ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/djangorestframework-filters/djangorestframework-filters_1.0.0.dev2-2ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/djangorestframework-filters/djangorestframework-filters_1.0.0.dev2-2ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading djangorestframework-filters_1.0.0.dev2-2ubuntu1.dsc: done.
  Uploading djangorestframework-filters_1.0.0.dev2-2ubuntu1.debian.tar.xz: done.
  Uploading djangorestframework-filters_1.0.0.dev2-2ubuntu1_source.buildinfo: done.
  Uploading djangorestframework-filters_1.0.0.dev2-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

[Lena Voytek (lvoytek)]

Yeah I'll send this over to them. I doubt it'll ever be added upstream since there haven't been updates in a few years but a merge request should help others if they need it. Debian will also need it once they start the Django 4 transition

diff --git a/debian/changelog b/debian/changelog
index 642dd49..aeb7bd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+djangorestframework-filters (1.0.0.dev2-2ubuntu1) mantic; urgency=medium
+
+  * d/p/fix-testapp-django4-compatibility.patch: Update test suite to be
+    compatible with Django 4 using re_path instead of the removed url
+    function (LP: #2022089)
+
+ -- Lena Voytek <[e-mail]>  Wed, 23 Aug 2023 15:43:38 -0700
+
 djangorestframework-filters (1.0.0.dev2-2) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index 923fc81..6ed4bb5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: djangorestframework-filters
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Wookey <[e-mail]>
 Section: python
 Priority: optional
diff --git a/debian/patches/fix-testapp-django4-compatibility.patch b/debian/patches/fix-testapp-django4-compatibility.patch
new file mode 100644
index 0000000..687ff8a
--- /dev/null
+++ b/debian/patches/fix-testapp-django4-compatibility.patch
@@ -0,0 +1,26 @@
+Description: Fix testsuite for Django 4 by updating the test application
+ As of Django 4, the django.conf.urls.url() function was removed. The
+ recommended replacement is to use re_path for url paths that use regex. This
+ patch replaces instances of the url function accordingly in testapp.
+Author: Lena Voytek <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/mantic/+source/djangorestframework-filters/+bug/2022089
+Last-Update: 2023-08-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/testapp/urls.py
++++ b/tests/testapp/urls.py
+@@ -1,5 +1,6 @@
+ 
+-from django.conf.urls import include, url
++from django.conf.urls import include
++from django.urls import re_path
+ from rest_framework import routers
+ 
+ from . import views
+@@ -15,5 +16,5 @@
+ 
+ 
+ urlpatterns = [
+-    url(r'^', include(router.urls)),
++    re_path(r'^', include(router.urls)),
+ ]
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c1eb23a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-testapp-django4-compatibility.patch