Merge ~lvoytek/ubuntu/+source/python-django-celery-results:django4-compatibility into ubuntu/+source/python-django-celery-results:ubuntu/devel

[Lena Voytek]

Fix autopkgtest against Django 4.2 by running with non-deprecated psycopg 3 and using the upstream pytest configuration file.

Note that this has to be run against psycopg 3.1.8 which was just uploaded to mantic and may need some time to settle.

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

Local autopkgtest results:

autopkgtest [12:41:26]: @@@@@@@@@@@@@@@@@@@@ summary
upstream PASS
autodep8-python3 PASS (superficial)
qemu-system-x86_64: terminating on signal 15 from pid 64343 (/usr/bin/python3)

[Julian Andres Klode (juliank)]

review: Approve

[Julian Andres Klode (juliank)]

Sponsoring this, just running tests here - hopefully.

[git-ubuntu bot (git-ubuntu-bot)]

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

review: Approve

[Julian Andres Klode (juliank)]

Sponsored!

FWIW it failed to build using

autopkgtest -U python-django-celery-results_2.5.1-1ubuntu1_source.changes -- podman ubuntu:mantic

apparently because it benchmarks a test case and it took 1.24s, which is longer than the 1s allowed. Doing the same with lxd --vm ubuntu-daily:mantic as the backend worked, but this seems to be a fragile test that's worth disabling for the future.

Test failure log:

> assert self.benchmark.stats.stats.max < 1
E assert 1.231338843004778 < 1
E + where 1.231338843004778 = <pytest_benchmark.stats.Stats object at 0x55060bad10>.max
E + where <pytest_benchmark.stats.Stats object at 0x55060bad10> = <pytest_benchmark.stats.Metadata object at 0x55060ba610>.stats
E + where <pytest_benchmark.stats.Metadata object at 0x55060ba610> = <pytest_benchmark.fixture.BenchmarkFixture object at 0x5505be5b90>.stats
E + where <pytest_benchmark.fixture.BenchmarkFixture object at 0x5505be5b90> = <t.integration.benchmark_models.benchmark_Models testMethod=test_taskresult_delete_expired>.benchmark

-------------------------------------------------- benchmark: 1 tests -------------------------------------------------
Name (time in s) Min Max Mean StdDev Median IQR Outliers OPS Rounds Iterations
-----------------------------------------------------------------------------------------------------------------------
test_taskresult_delete_expired 1.2313 1.2313 1.2313 0.0000 1.2313 0.0000 0;0 0.8121 1 1
-----------------------------------------------------------------------------------------------------------------------

diff --git a/debian/changelog b/debian/changelog
index 47608fd..74b168e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-django-celery-results (2.5.1-1ubuntu1) mantic; urgency=medium
+
+  * d/control: Upgrade to psycopg 3 for compatibility with Django 4 in test
+    suite (LP: #2022089)
+  * d/t/upstream: Add pytest conftest file when running upstream test suite.
+    Including the file tells pytest to not run benchmarks as intended.
+
+ -- Lena Voytek <[e-mail]>  Mon, 28 Aug 2023 12:59:01 -0700
+
 python-django-celery-results (2.5.1-1) unstable; urgency=medium
 
   * Use github tags instead of releases for d/watch.
diff --git a/debian/control b/debian/control
index d82fbc2..35cf114 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: python-django-celery-results
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders:
  Michael Fladischer <[e-mail]>,
 Build-Depends:
@@ -12,7 +13,7 @@ Build-Depends:
  python3-celery,
  python3-django,
  python3-mock,
- python3-psycopg2,
+ python3-psycopg,
  python3-pytest,
  python3-pytest-benchmark,
  python3-pytest-django,
diff --git a/debian/tests/upstream b/debian/tests/upstream
index 32eae52..02c26a8 100644
--- a/debian/tests/upstream
+++ b/debian/tests/upstream
@@ -4,7 +4,7 @@ set -e
 
 runuser -u postgres -- psql -f $(pwd)/debian/tests/init.sql
 
-cp -r t setup.cfg manage.py ${AUTOPKGTEST_TMP}
+cp -r t setup.cfg manage.py conftest.py ${AUTOPKGTEST_TMP}
 cd ${AUTOPKGTEST_TMP}
 for p in $(py3versions -s); do
     $p -m pytest