Merge ~pushkarnk/ubuntu/+source/dnspython:merge-lp2043954-noble into ubuntu/+source/dnspython:debian/sid

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

Ran a build in PPA https://launchpad.net/~pushkarnk/+archive/ubuntu/merges-ppa

[Utkarsh Gupta (utkarsh)]

Hey there!

+ - Remove python3-sniffio from Suggests

I don't see this in the diff? And the reasoning for that? I do see https://git.launchpad.net/~pushkarnk/ubuntu/+source/dnspython/commit/?id=a92ad5ce3afe9654b0bace5f177686fa64ef631e - which tells me what's happening but it's still unclear why it was done? :)

review: Needs Information

[Utkarsh Gupta (utkarsh)]

Once that's clear and you're ready for review (by marking the MP as "Needs Review"), I'll take that up and sponsor your upload. ;)

[Pushkar Kulkarni (pushkarnk)]

Tested a fresh install on noble. Also tested an upgrade. Both work well.

[Pushkar Kulkarni (pushkarnk)]

Ran autopkgtests against the PPA using:

autopkgtest --apt-upgrade --shell-fail --output-dir dnspython-ppa --setup-commands="sudo add-apt-repository -y -u -s ppa:pushkarnk/merges-ppa" dnspython -- lxd ubuntu-daily:noble

The tests passed.

[Pushkar Kulkarni (pushkarnk)]

The only change here is a new upstream version. So, I skipped running `check-mir` which was previously recommended.

[Pushkar Kulkarni (pushkarnk)]

> Hey there!
>
>
> + - Remove python3-sniffio from Suggests
>
> I don't see this in the diff? And the reasoning for that? I do see https://git
> .launchpad.net/~pushkarnk/ubuntu/+source/dnspython/commit/?id=a92ad5ce3afe9654
> b0bace5f177686fa64ef631e - which tells me what's happening but it's still
> unclear why it was done? :)

Hey, thanks for looking into this. I guess this is the chronology:

 - [1] moved some of the dependencies, including python3-sniffio to Suggests from Recommended (to avoid MIRs)
 - [2] is a debian commit which removed python3-sniffio as a dependency, because it also came in as a dependency of python3-trio
 - Now, every time we apply [1] over debian/sid, we need to also apply [3] to remove the redundant python3-sniffio dependency

Is there a better way to organize these commits?

[1] https://git.launchpad.net/ubuntu/+source/dnspython/commit/?id=55aaf9a022da3329f91c2f231735886af8fb04d2
[2] https://git.launchpad.net/ubuntu/+source/dnspython/commit/?id=ee715c17c7c379444767c369c7161139b53165d1
[3] https://git.launchpad.net/ubuntu/+source/dnspython/commit/?id=b6626db4a717dc211de816dd9b2b6e8673efcfcb

[Gianfranco Costamagna (costamagnagianfranco)]

Sponsored!

review: Approve

Unmerged commits

ee6da07... by Pushkar Kulkarni on 2023-11-20

Update changelog

033f891... by Pushkar Kulkarni on 2023-11-20

update-maintainer

e633b75... by Pushkar Kulkarni on 2023-11-20

reconstruct-changelog

e743378... by Pushkar Kulkarni on 2023-11-20

merge-changelogs

ea53bd3... by Pushkar Kulkarni on 2023-08-07

Drop python-httpcore from Recommends to Suggests

Like the python-httpx dependency, which brings in a lot of transitive
dependencies not in the main archive, was earlier moved down from
Recommends to Suggests, the new httpcore dependency can also be
moved down to Suggests. The httpcore dependency was brought in
to work around an httpx limitation in the context of DNS over HTTPS.
The httpx dependency is also brought in for the same feature.

a92ad5c... by Pushkar Kulkarni on 2023-08-04

Remove python3-sniffio from Suggests

9c7acda... by Lukas Märdian on 2023-01-31

Drop python-h2 & httpx (DNS Over HTTPS, DOH) to Suggests (LP: 2004272)

This is to avoid a big tree of additional transitive dependencies (for now).
Foundations might agree to maintain all of those in the future and drop this
delta.

diff --git a/debian/changelog b/debian/changelog
index 8075abd..b654f15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,31 @@
+dnspython (2.4.2-1ubuntu1) noble; urgency=medium
+
+  * Merge from Debian unstable (LP: #2043954). Remaining changes:
+    - Drop python-h2 & httpx (DNS Over HTTPS, DOH) to Suggests
+    - Remove python3-sniffio from Suggests
+    - Drop python-httpcore from Recommends to Suggests
+
+ -- Pushkar Kulkarni <[e-mail]>  Mon, 20 Nov 2023 10:48:32 +0530
+
 dnspython (2.4.2-1) unstable; urgency=medium
 
   * New upstream release
 
  -- Scott Kitterman <[e-mail]>  Fri, 11 Aug 2023 21:35:53 -0400
 
+dnspython (2.4.1-1ubuntu2) mantic; urgency=medium
+
+  * d/control: Move the httpcore dependency to Suggests (LP: #2030475)
+
+ -- Pushkar Kulkarni <[e-mail]>  Mon, 07 Aug 2023 17:40:17 +0530
+
+dnspython (2.4.1-1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable (LP: #2029461). Remaining changes:
+    - Drop python-h2 & httpx (DNS Over HTTPS, DOH) to Suggests
+
+ -- Pushkar Kulkarni <[e-mail]>  Thu, 03 Aug 2023 19:26:28 +0530
+
 dnspython (2.4.1-1) unstable; urgency=medium
 
   * New upstream release
@@ -36,6 +58,12 @@ dnspython (2.4.0~rc1-1) experimental; urgency=medium
 
  -- Scott Kitterman <[e-mail]>  Thu, 06 Jul 2023 22:09:07 -0400
 
+dnspython (2.3.0-1ubuntu1) lunar; urgency=medium
+
+  * Drop python-h2 & httpx (DNS Over HTTPS, DOH) to Suggests (LP: 2004272)
+
+ -- Lukas Märdian <[e-mail]>  Tue, 31 Jan 2023 14:37:06 +0100
+
 dnspython (2.3.0-1) unstable; urgency=medium
 
   * Upload to unstable
diff --git a/debian/control b/debian/control
index 5c739ac..edf8111 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: dnspython
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Robert S. Edmonds <[e-mail]>,
            Scott Kitterman <[e-mail]>,
            Matthew Grant <[e-mail]>
@@ -30,13 +31,10 @@ Architecture: all
 Depends: netbase, ${misc:Depends}, ${python3:Depends}
 Recommends: ca-certificates,
             python3-cryptography,
-            python3-h2,
-            python3-httpcore (>=0.17.3),
-            python3-httpx,
             python3-idna,
             python3-requests,
             python3-requests-toolbelt
-Suggests: python3-trio, python3-aioquic
+Suggests: python3-trio, python3-aioquic, python3-h2, python3-httpx, python3-httpcore (>=0.17.3)
 Description: DNS toolkit for Python 3
  dnspython is a DNS toolkit for Python. It supports almost all record types. It
  can be used for queries, zone transfers, and dynamic updates. It supports TSIG
diff --git a/debian/tests/control b/debian/tests/control
index b102c2d..497c969 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,9 +3,7 @@ Depends: ca-certificates,
          python3-aioquic,
          python3-all,
          python3-cryptography,
-         python3-h2,
          python3-httpcore,
-         python3-httpx,
          python3-idna,
          python3-pytest,
          python3-requests,