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

Proposed by Lena Voytek
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merged at revision: d8e4fa3880db5a51b1b8b20efe7e8eb2b9f91532
Proposed branch: ~lvoytek/ubuntu/+source/django-tables:django4-compatibility
Merge into: ubuntu/+source/django-tables:ubuntu/devel
Diff against target: 50 lines (+12/-4)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/tests/test-run-py3 (+3/-3)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Sergio Durigan Junior (community) Approve
Canonical Server Pending
Canonical Server Reporter Pending
Review via email: mp+449770@code.launchpad.net

Description of the change

Update autopkgtest to work with Django 4.2, which is now in proposed

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

local autopkgtest results:

autopkgtest [12:53:20]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS
test-run-py3 PASS
qemu-system-x86_64: terminating on signal 15 from pid 71762 (/usr/bin/python3)

To post a comment you must log in.
Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote :

LGTM, +1

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, Lena.

LGTM. Does it make sense to forward this change to Debian?

Uploaded:

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

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 95d6cbe..e6113fc 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+django-tables (2.6.0-1ubuntu1) mantic; urgency=medium
7+
8+ * d/t/test-run-py3: Update test to be compatible with Django 4 using re_path
9+ instead of the removed url function (LP: #2022089)
10+
11+ -- Lena Voytek <lena.voytek@canonical.com> Wed, 23 Aug 2023 11:58:47 -0700
12+
13 django-tables (2.6.0-1) unstable; urgency=medium
14
15 * Team upload.
16diff --git a/debian/control b/debian/control
17index efceb1a..b4b3a5a 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -1,7 +1,8 @@
21 Source: django-tables
22 Section: python
23 Priority: optional
24-Maintainer: Debian Python Team <team+python@tracker.debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Debian Python Team <team+python@tracker.debian.org>
27 Uploaders:
28 Brian May <bam@debian.org>,
29 Build-Depends:
30diff --git a/debian/tests/test-run-py3 b/debian/tests/test-run-py3
31index aa74768..fb3b751 100755
32--- a/debian/tests/test-run-py3
33+++ b/debian/tests/test-run-py3
34@@ -45,14 +45,14 @@ __EOF__
35
36
37 cat > testproject/urls.py << __EOF__
38-from django.conf.urls import url
39+from django.urls import re_path
40 from django.contrib import admin
41
42 from tutorial.views import people
43
44 urlpatterns = [
45- url(r'^admin/', admin.site.urls),
46- url(r'^people/', people)
47+ re_path(r'^admin/', admin.site.urls),
48+ re_path(r'^people/', people)
49 ]
50 __EOF__
51

Subscribers

People subscribed via source and target branches

to all changes: