Merge ~lvoytek/ubuntu/+source/factory-boy:django4-compatibility into ubuntu/+source/factory-boy:ubuntu/devel

Proposed by Lena Voytek
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merged at revision: 236c17359b33b28fb57933a9e2cf6684e5899f2f
Proposed branch: ~lvoytek/ubuntu/+source/factory-boy:django4-compatibility
Merge into: ubuntu/+source/factory-boy:ubuntu/devel
Diff against target: 69 lines (+35/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/demo-django4-compatibility.patch (+25/-0)
debian/patches/series (+1/-0)
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+449889@code.launchpad.net

Description of the change

Fix autopkgtest by patching example project to be compatible with Django 4

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

local autopkgtest results:
autopkgtest [15:57:00]: @@@@@@@@@@@@@@@@@@@@ summary
unit-tests-p3 PASS
django-example PASS
qemu-system-x86_64: terminating on signal 15 from pid 109598 (/usr/bin/python3)

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, Lena.

Uploaded:

$ dput factory-boy_2.11.1-5ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/factory-boy/factory-boy_2.11.1-5ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/factory-boy/factory-boy_2.11.1-5ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading factory-boy_2.11.1-5ubuntu1.dsc: done.
  Uploading factory-boy_2.11.1-5ubuntu1.debian.tar.xz: done.
  Uploading factory-boy_2.11.1-5ubuntu1_source.buildinfo: done.
  Uploading factory-boy_2.11.1-5ubuntu1_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 142c795..ad203d1 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+factory-boy (2.11.1-5ubuntu1) mantic; urgency=medium
7+
8+ * d/p/demo-django4-compatibility.patch: Fix Django 4 compatibility in the
9+ example application used in the django-example autopkgtest (LP: #2022089)
10+
11+ -- Lena Voytek <lena.voytek@canonical.com> Thu, 24 Aug 2023 13:57:01 -0700
12+
13 factory-boy (2.11.1-5) unstable; urgency=medium
14
15 * Set field Upstream-Contact in debian/copyright.
16diff --git a/debian/control b/debian/control
17index 39894ac..4096c02 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -1,7 +1,8 @@
21 Source: factory-boy
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: Brian May <bam@debian.org>
28 Build-Depends: debhelper-compat (= 13),
29 dh-python,
30diff --git a/debian/patches/demo-django4-compatibility.patch b/debian/patches/demo-django4-compatibility.patch
31new file mode 100644
32index 0000000..423b8c4
33--- /dev/null
34+++ b/debian/patches/demo-django4-compatibility.patch
35@@ -0,0 +1,25 @@
36+Description: Fix django_demo example compatibility with Django 4
37+ The django_demo example project is used in the django-example autopkgtest, so
38+ it must be compatible with Django 4 to succeed. This is done by using the path
39+ function instead of the removed url function in urls.py. This was fixed in an
40+ upstream commit.
41+Author: Fran├žois Freitag <mail@franek.fr>
42+Origin: backport, https://github.com/FactoryBoy/factory_boy/commit/27e55cc20800b9f3c9205fc63833e90d115eea25
43+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/mantic/+source/factory-boy/+bug/2022089
44+Last-Update: 2023-08-24
45+---
46+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
47+--- a/examples/django_demo/django_demo/urls.py
48++++ b/examples/django_demo/django_demo/urls.py
49+@@ -13,9 +13,9 @@
50+ 1. Import the include() function: from django.conf.urls import url, include
51+ 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
52+ """
53+-from django.conf.urls import url
54+ from django.contrib import admin
55++from django.urls import path
56+
57+ urlpatterns = [
58+- url(r'^admin/', admin.site.urls),
59++ path('admin/', admin.site.urls),
60+ ]
61diff --git a/debian/patches/series b/debian/patches/series
62index dcdc432..21f04a9 100644
63--- a/debian/patches/series
64+++ b/debian/patches/series
65@@ -3,3 +3,4 @@ removed-privacy-breach.patch
66 0003-Add-ipaddress-to-depends.patch
67 compatibility_python37.patch
68 0005-Fix-test-for-Django-2.2.patch
69+demo-django4-compatibility.patch

Subscribers

People subscribed via source and target branches

to all changes: