Control: tag -1 pending
I NMUed my patch from last week to DELAYED/2. Here's the final diff for
the record.
Thanks,
--
Colin Watson (he/him) [[email protected]]
diffstat for httpx-0.28.1 httpx-0.28.1
changelog | 7 +++++++
patches/pytest-9.1.patch | 36 ++++++++++++++++++++++++++++++++++++
patches/series | 1 +
3 files changed, 44 insertions(+)
diff -Nru httpx-0.28.1/debian/changelog httpx-0.28.1/debian/changelog
--- httpx-0.28.1/debian/changelog 2025-02-28 22:42:10.000000000 +0000
+++ httpx-0.28.1/debian/changelog 2026-07-13 11:24:29.000000000 +0100
@@ -1,3 +1,10 @@
+httpx (0.28.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix logging tests for pytest 9.1 (closes: #1140980).
+
+ -- Colin Watson <[email protected]> Mon, 13 Jul 2026 11:24:29 +0100
+
httpx (0.28.1-1) unstable; urgency=medium
* New upstream release; Closes: #1098569
diff -Nru httpx-0.28.1/debian/patches/pytest-9.1.patch httpx-0.28.1/debian/patches/pytest-9.1.patch
--- httpx-0.28.1/debian/patches/pytest-9.1.patch 1970-01-01 01:00:00.000000000 +0100
+++ httpx-0.28.1/debian/patches/pytest-9.1.patch 2026-07-07 13:34:38.000000000 +0100
@@ -0,0 +1,36 @@
+From: Colin Watson <[email protected]>
+Date: Tue, 7 Jul 2026 13:28:59 +0100
+Subject: Fix logging tests for pytest 9.1
+
+https://github.com/pytest-dev/pytest/issues/3697 caused `caplog` to
+return more records than before.
+
+Bug-Debian: https://bugs.debian.org/1140980
+Forwarded: can't because upstream does not accept either issues or PRs
+Last-Update: 2026-07-07
+---
+ tests/test_utils.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_utils.py b/tests/test_utils.py
+index f9c215f..65659ab 100644
+--- a/tests/test_utils.py
++++ b/tests/test_utils.py
+@@ -56,7 +56,7 @@ def test_logging_request(server, caplog):
+ response = client.get(server.url)
+ assert response.status_code == 200
+
+- assert caplog.record_tuples == [
++ assert [record for record in caplog.record_tuples if record[0] == "httpx"] == [
+ (
+ "httpx",
+ logging.INFO,
+@@ -71,7 +71,7 @@ def test_logging_redirect_chain(server, caplog):
+ response = client.get(server.url.copy_with(path="/redirect_301"))
+ assert response.status_code == 200
+
+- assert caplog.record_tuples == [
++ assert [record for record in caplog.record_tuples if record[0] == "httpx"] == [
+ (
+ "httpx",
+ logging.INFO,
diff -Nru httpx-0.28.1/debian/patches/series httpx-0.28.1/debian/patches/series
--- httpx-0.28.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ httpx-0.28.1/debian/patches/series 2026-07-07 13:34:38.000000000 +0100
@@ -0,0 +1 @@
+pytest-9.1.patch
