Merge ~athos-ribeiro/ubuntu/+source/python-django:fix-test-regression into ubuntu/+source/python-django:ubuntu/devel

[Athos Ribeiro]

This patch fixes a python-django ftbfs failure, as described in https://bugs.launchpad.net/ubuntu/+source/python-django/+bug/1945993

A PPA with the proposed change is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/django-regression/+packages

I also ran the dep8 test suite for this package. Here is the output summary:

autopkgtest [18:19:12]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS
command2 PASS

[Sergio Durigan Junior (sergiodj)]

I'll take a look at this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

I'm leaving a few comments regarding the DEP-3 headers; let me know when you adjust it and I will gladly take another look.

I have a more general comment regarding this part of the bug description:

> The bug has also been fixed in Debian [3], however, Debian unstable has migrated to python-django
> 3. Hence, we should add a delta for impish, which can be dropped later for the jj series when we
> move to django 3.

Upon looking at the Debian commit you linked:

https://salsa.debian.org/python-team/packages/python-django/-/blob/debian/sid/debian/patches/0006-Skip-a-test-that-is-fixed-upstream.patch

I noticed that they're simply skipping the test, and not really fixing the problem like you did here. Maybe it's worth really submitting the fix to the Debian package so that it's properly included in the next release, otherwise we will end up with different approaches to the same problem when we merge this package during the JJ cycle. WDYT?

review: Needs Fixing

[Athos Ribeiro (athos-ribeiro)]

Thanks for the review, Sergio!

I addressed your comments and I will follow your suggestion on submitting this to Debian. The reason I did not do it initially was that 4.0a1 already has the fix, and was already pushed to experimental.

[Athos Ribeiro (athos-ribeiro)]

Upstream released a new 3.2.8 version that includes this fix, which was already pushed to Debian unstable a few hours ago.

Hence, once again, I made some changes in the dep3 headers.

However, I am now wondering if it wouldn't be better to just sync the package from Debian instead to pull in the fix and avoid introducing the delta. WDYT?

[Athos Ribeiro (athos-ribeiro)]

As per the changes (see attached commit history below), the new minor release consists of documentation changes and bug fixes. Would we still need to file a FFe in this case?

4540e976d4 (tag: 3.2.8) [3.2.x] Bumped version for 3.2.8 release.
65367b0500 [3.2.x] Added release date for 3.2.7.
51e4dbfeb2 [3.2.x] Refs #27694 -- Doc'd lookups that can be chained with HStoreField key transforms.
031ffc5c84 [3.2.x] Corrected field and model check messages in docs.
7607fe922f [3.2.x] Removed obsolete GEOS 3.5 requirement note.
6760f4fa25 [3.2.x] Fixed #33083 -- Fixed selecting all items in the admin changelist when actions are both top and bottom.
e235c7815a [3.2.x] Fixed broken links and redirects in docs.
51e76c922f [3.2.x] Used :rfc: role in docs/topics/conditional-view-processing.txt.
d4a587a5fa [3.2.x] Fixed #33077 -- Fixed links to related models for admin's readonly fields in custom admin site.
561a1c0905 [3.2.x] Fixed typo in docs/intro/reusable-apps.txt.
454ee4d3b8 [3.2.x] Corrected outputs and made cosmetic edits in GeoDjango tutorial.
b51e0a37cf [3.2.x] Doc'd Jinja2 form renderer.
a7be74d017 [3.2.x] Clarified type of Window()'s partition_by and order_by arguments.
54684a3ec0 [3.2.x] Refs #31055 -- Doc'd 'databases' argument of check functions.
1f86ff31b1 [3.2.x] Fixed typo in docs/topics/i18n/formatting.txt.
b61f44c339 [3.2.x] Fixed #33082 -- Fixed CommandTests.test_subparser_invalid_option on Python 3.9.7+.
707239eabf [3.2.x] Added stub release notes for Django 3.2.8.
d5710f405a [3.2.x] Post-release version bump.
45a0c54b67 (tag: 3.2.7) [3.2.x] Bumped version for 3.2.7 release.

[Sergio Durigan Junior (sergiodj)]

Thanks for the follow up, Athos.

As we discussed during standup, Debian unstable/experimental are ahead of Ubuntu Impish by a lot, so I think it makes sense to carry this as a delta. Also, thanks for bringing it to my attention that Debian experimental already has the 4.0a version; in this case, I agree that it forwarding the patch to them is not required.

Having said that, I'm happy with the changes you've made so I'll go ahead and sponsor the package. Thanks again!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 6deb982..01b2283 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-django (2:2.2.24-1ubuntu1) impish; urgency=medium
+
+  * d/p/test_subparser_regression.patch: Fix test regression (LP: #1945993)
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 04 Oct 2021 10:56:57 -0300
+
 python-django (2:2.2.24-1) unstable; urgency=medium
 
   * New upstream security release. (Closes: #989394)
diff --git a/debian/control b/debian/control
index 888f714..4d6f99d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: python-django
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders:
  Luke Faraone <[e-mail]>,
  Raphaël Hertzog <[e-mail]>,
diff --git a/debian/patches/0006-test-subparser-regression.patch b/debian/patches/0006-test-subparser-regression.patch
new file mode 100644
index 0000000..6c7e3ff
--- /dev/null
+++ b/debian/patches/0006-test-subparser-regression.patch
@@ -0,0 +1,20 @@
+Description: Fix test suite to support Python 3.9 changes to argparse
+
+Applied-Upstream: 3.2.8
+Author: Mariusz Felisiak <[e-mail]>
+Bug: https://code.djangoproject.com/ticket/33082
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-django/+bug/1945993
+Last-Update: 2021-10-04
+Origin: upstream, https://github.com/django/django/commit/b61f44c339830ea53663415f00cbd17e2fd5aa43
+
+--- a/tests/user_commands/tests.py
++++ b/tests/user_commands/tests.py
+@@ -218,7 +218,7 @@
+         self.assertIn('bar', out.getvalue())
+ 
+     def test_subparser_invalid_option(self):
+-        msg = "Error: invalid choice: 'test' (choose from 'foo')"
++        msg = "invalid choice: 'test' (choose from 'foo')"
+         with self.assertRaisesMessage(CommandError, msg):
+             management.call_command('subparser', 'test', 12)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 75da922..08cb34f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0004-Use-locally-installed-documentation-sources.patch
 0004-Set-the-default-shebang-to-new-projects-to-use-Pytho.patch
 0005-Use-usr-bin-env-python3-shebang-for-django-admin.py.patch
+0006-test-subparser-regression.patch