Merge ~lvoytek/ubuntu/+source/requests:remove-charset-normalizer-pybuild into ubuntu/+source/requests:ubuntu/devel

[Lena Voytek]

With the latest requests sync, pybuild automatically extracts the charset_normalizer dependency and attempts to install it for building. Since requests is in main, it can't use this universe dependency. This update readds and cleans up the charset_normalizer removal patch in favor of chardet

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/requests-merges

The latest build shows that python3-charset-normalizer is not installed

test results:
  - requests/2.32.3+dfsg-1ubuntu1~ppa8
    + ✅ requests on oracular for amd64 @ 26.06.24 19:02:18

[Bryce Harrington (bryce)]

Confirmed charset-normalizer is in universe, and makes sense that this delta will be ubuntu-specific.

I wonder if the reason chardet is in main is due to security concerns for charset-normalizer; if that is the case then it might be relevant to suggest Debian shift as well. But if the choice is just to keep duplicative code out of main, then yeah this can just live as delta from here. Thanks for annotating the change!

### Debian ###
python-charset-normalizer | 3.0.1-2 | bookworm
python-charset-normalizer | 3.3.2-1 | trixie
python-charset-normalizer | 3.3.2-1 | sid

### Ubuntu ###
python-charset-normalizer | 2.0.6-2 | jammy/universe
python-charset-normalizer | 3.2.0-1 | mantic/universe
python-charset-normalizer | 3.3.2-1 | noble/universe
python-charset-normalizer | 3.3.2-1 | oracular/universe

Test results, packaging and change itself LGTM, +1.

review: Approve

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

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

review: Approve

[Lena Voytek (lvoytek)]

Thanks Bryce! Uploaded

dput ubuntu ../requests_2.32.3+dfsg-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../requests_2.32.3+dfsg-1ubuntu1_source.changes: Valid signature from 34B8AD7D9529E793
Checking signature on .dsc
gpg: ../requests_2.32.3+dfsg-1ubuntu1.dsc: Valid signature from 34B8AD7D9529E793
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading requests_2.32.3+dfsg-1ubuntu1.dsc: done.
  Uploading requests_2.32.3+dfsg-1ubuntu1.debian.tar.xz: done.
  Uploading requests_2.32.3+dfsg-1ubuntu1_source.buildinfo: done.
  Uploading requests_2.32.3+dfsg-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Lena Voytek (lvoytek)]

Also for reference, yeah the MIR was rejected due to duplication of chardet's functionality:
https://bugs.launchpad.net/ubuntu/+source/python-charset-normalizer/+bug/1977475

diff --git a/debian/changelog b/debian/changelog
index 3e85756..406d8c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+requests (2.32.3+dfsg-1ubuntu1) oracular; urgency=medium
+
+  * d/p/remove-charset-normalizer-dependency.patch: Remove charset-normalizer
+    as a build dependency of requests (LP: #1975541)
+
+ -- Lena Voytek <[e-mail]>  Wed, 26 Jun 2024 08:56:02 -0700
+
 requests (2.32.3+dfsg-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index edcf283..f075eea 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: requests
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Daniele Tricoli <[e-mail]>
 Section: python
 Priority: optional
diff --git a/debian/patches/remove-charset-normalizer-dependency.patch b/debian/patches/remove-charset-normalizer-dependency.patch
new file mode 100644
index 0000000..293c84e
--- /dev/null
+++ b/debian/patches/remove-charset-normalizer-dependency.patch
@@ -0,0 +1,35 @@
+Description: Remove charset-normalizer package in favor of chardet
+ By default requests upstream uses charset_normalizer for character detection,
+ but supports the use of chardet instead. Since python-charset-normalizer is in
+ universe, requests in Ubuntu cannot depend on it. This patch removes the
+ dependency from setup.py and forces using_charset_normalizer to false so it is
+ not automatically included by pybuild.
+Forwarded: not-needed
+X-Not-Forwarded-Reason: charset-normalizer being in universe is Ubuntu-specific
+Author: Lena Voytek <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/requests/+bug/1975541
+Last-Update: 2024-06-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/setup.py
++++ b/setup.py
+@@ -59,7 +59,7 @@
+     sys.exit()
+ 
+ requires = [
+-    "charset_normalizer>=2,<4",
++    "chardet>=3.0.2",
+     "idna>=2.5,<4",
+     "urllib3>=1.21.1,<3",
+     "certifi>=2017.4.17",
+--- a/src/requests/help.py
++++ b/src/requests/help.py
+@@ -112,7 +109,7 @@
+         "implementation": implementation_info,
+         "system_ssl": system_ssl_info,
+         "using_pyopenssl": pyopenssl is not None,
+-        "using_charset_normalizer": chardet is None,
++        "using_charset_normalizer": False,
+         "pyOpenSSL": pyopenssl_info,
+         "urllib3": urllib3_info,
+         "chardet": chardet_info,
diff --git a/debian/patches/series b/debian/patches/series
index 5bde12d..81e1af9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Remove-remote-images-traking-code-and-ads.patch
 0002-Fix-tests-with-HTTP-proxy.patch
+remove-charset-normalizer-dependency.patch