diff -Nru python-django-4.0.5/debian/changelog python-django-4.0.5/debian/changelog --- python-django-4.0.5/debian/changelog 2022-06-06 11:31:50.000000000 +0000 +++ python-django-4.0.5/debian/changelog 2022-06-16 07:00:35.000000000 +0000 @@ -1,3 +1,15 @@ +python-django (2:4.0.5-2) unstable; urgency=medium + + [ Lena Voytek ] + * Add updated version of SQLite 3.37+ / test_custom_fields patch. + (Closes: #1012784) + + [ Chris Lamb ] + * Add debian/gitlab-ci.yml. + - Allow some elements of the pipeline to fail. + + -- Chris Lamb Thu, 16 Jun 2022 08:00:35 +0100 + python-django (2:4.0.5-1) unstable; urgency=medium * Upload 4.x stable release stream to unstable using the 4.0.5 bugfix diff -Nru python-django-4.0.5/debian/gitlab-ci.yml python-django-4.0.5/debian/gitlab-ci.yml --- python-django-4.0.5/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ python-django-4.0.5/debian/gitlab-ci.yml 2022-06-16 07:00:35.000000000 +0000 @@ -0,0 +1,8 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml + +lintian: + allow_failure: true + +reprotest: + allow_failure: true diff -Nru python-django-4.0.5/debian/patches/0005-Fixed-inspectdb.tests.InspectDBTestCase.test_custom.patch python-django-4.0.5/debian/patches/0005-Fixed-inspectdb.tests.InspectDBTestCase.test_custom.patch --- python-django-4.0.5/debian/patches/0005-Fixed-inspectdb.tests.InspectDBTestCase.test_custom.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-django-4.0.5/debian/patches/0005-Fixed-inspectdb.tests.InspectDBTestCase.test_custom.patch 2022-06-16 07:00:35.000000000 +0000 @@ -0,0 +1,33 @@ +From: Mariusz Felisiak +Date: Thu, 9 Dec 2021 13:21:36 +0100 +Subject: Fixed inspectdb.tests.InspectDBTestCase.test_custom_fields() on + SQLite 3.37+. + +Use FlexibleFieldLookupDict which is case-insensitive mapping because +SQLite 3.37+ returns some data type names uppercased e.g. TEXT. +--- a/tests/inspectdb/tests.py ++++ b/tests/inspectdb/tests.py +@@ -387,18 +387,17 @@ + Introspection of columns with a custom field (#21090) + """ + out = StringIO() +- orig_data_types_reverse = connection.introspection.data_types_reverse +- try: +- connection.introspection.data_types_reverse = { ++ with mock.patch( ++ 'django.db.connection.introspection.data_types_reverse.base_data_types_reverse', ++ { + "text": "myfields.TextField", + "bigint": "BigIntegerField", +- } ++ }, ++ ): + call_command("inspectdb", "inspectdb_columntypes", stdout=out) + output = out.getvalue() + self.assertIn("text_field = myfields.TextField()", output) + self.assertIn("big_int_field = models.BigIntegerField()", output) +- finally: +- connection.introspection.data_types_reverse = orig_data_types_reverse + + def test_introspection_errors(self): + """ diff -Nru python-django-4.0.5/debian/patches/series python-django-4.0.5/debian/patches/series --- python-django-4.0.5/debian/patches/series 2022-06-06 11:31:50.000000000 +0000 +++ python-django-4.0.5/debian/patches/series 2022-06-16 07:00:35.000000000 +0000 @@ -2,3 +2,4 @@ 0002-use_debian_geoip_database_as_default.diff 0003-Set-the-default-shebang-to-new-projects-to-use-Pytho.patch 0004-Use-locally-installed-documentation-sources.patch +0005-Fixed-inspectdb.tests.InspectDBTestCase.test_custom.patch