diff mbox series

[2/2] python3-requests: Increase chardet upper limit

Message ID 20260430161702.77076-2-danismostlikely@gmail.com
State New
Headers show
Series [1/2] tar: make gtar always gnu tar | expand

Commit Message

Dan McGregor April 30, 2026, 4:17 p.m. UTC 
From: Dan McGregor <dan.mcgregor@vecima.com>

OE Core includes chardet 6.0, while requests warns for any version
greater than or equal to 6.0. Not for any real reason, but because
it was a higher version than what was released when requests 2.32
was released.

Signed-off-by: Dan McGregor <dan.mcgregor@vecima.com>
---
 ...01-Increase-chardet-upper-limit-to-7.patch | 26 +++++++++++++++++++
 .../python/python3-requests_2.32.5.bb         |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch

Comments

patchtest@automation.yoctoproject.org April 30, 2026, 4:30 p.m. UTC | #1 
Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/2-2-python3-requests-Increase-chardet-upper-limit.patch

FAIL: test Signed-off-by presence: A patch file has been added without a Signed-off-by tag: '0001-Increase-chardet-upper-limit-to-7.patch' (test_patch.TestPatch.test_signed_off_by_presence)

PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!
Tim Orling April 30, 2026, 5:51 p.m. UTC | #2 
On Thu, Apr 30, 2026 at 9:18 AM Dan McGregor via lists.openembedded.org
<danismostlikely=gmail.com@lists.openembedded.org> wrote:

> From: Dan McGregor <dan.mcgregor@vecima.com>
>
> OE Core includes chardet 6.0, while requests warns for any version
> greater than or equal to 6.0. Not for any real reason, but because
> it was a higher version than what was released when requests 2.32
> was released.
>
>
For "master" we should upgrade to 2.33.1 which is the latest release and
includes this patch:
https://github.com/psf/requests/compare/v2.32.5...v2.33.1

For 'wrynose' we should use the backport, but there is also a bump to
chardet < 8 that merged:
https://github.com/psf/requests/commit/b2a1d33f571518ca9a6148e7da787cc5827f897a



> Signed-off-by: Dan McGregor <dan.mcgregor@vecima.com>
> ---
>  ...01-Increase-chardet-upper-limit-to-7.patch | 26 +++++++++++++++++++
>  .../python/python3-requests_2.32.5.bb         |  1 +
>  2 files changed, 27 insertions(+)
>  create mode 100644
> meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch
>
> diff --git
> a/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch
> b/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch
> new file mode 100644
> index 00000000000..2c445e42549
> --- /dev/null
> +++
> b/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch
> @@ -0,0 +1,26 @@
> +From 0f965846b95d096d76a1795db37fbe9acad0eb65 Mon Sep 17 00:00:00 2001
> +From: Amin Vakil <info@aminvakil.com>
> +Date: Sun, 22 Feb 2026 19:37:16 +0330
> +Subject: [PATCH] Increase chardet upper limit to 7
> +
> +Upstream-Status: Backport [
> https://github.com/psf/requests/commit/4bd79e397304d46dfccd76f36c07f66c0295ff82
> ]
> +---
> + src/requests/__init__.py | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/requests/__init__.py b/src/requests/__init__.py
> +index 051cda13..9a80c625 100644
> +--- a/src/requests/__init__.py
> ++++ b/src/requests/__init__.py
> +@@ -76,7 +76,7 @@ def check_compatibility(urllib3_version,
> chardet_version, charset_normalizer_ver
> +         major, minor, patch = chardet_version.split(".")[:3]
> +         major, minor, patch = int(major), int(minor), int(patch)
> +         # chardet_version >= 3.0.2, < 6.0.0
> +-        assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0)
> ++        assert (3, 0, 2) <= (major, minor, patch) < (7, 0, 0)
> +     elif charset_normalizer_version:
> +         major, minor, patch = charset_normalizer_version.split(".")[:3]
> +         major, minor, patch = int(major), int(minor), int(patch)
> +--
> +2.44.4
> +
> diff --git a/meta/recipes-devtools/python/python3-requests_2.32.5.bb
> b/meta/recipes-devtools/python/python3-requests_2.32.5.bb
> index 3477a5d83e9..02d476e975f 100644
> --- a/meta/recipes-devtools/python/python3-requests_2.32.5.bb
> +++ b/meta/recipes-devtools/python/python3-requests_2.32.5.bb
> @@ -8,6 +8,7 @@ inherit pypi python_setuptools_build_meta
>  SRC_URI[sha256sum] =
> "dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf"
>
>  SRC_URI += "file://CVE-2026-25645.patch"
> +SRC_URI += "file://0001-Increase-chardet-upper-limit-to-7.patch"
>  SRC_URI:append:class-nativesdk = " file://
> environment.d-python3-requests.sh"
>
>  do_install:append:class-nativesdk() {
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#236176):
> https://lists.openembedded.org/g/openembedded-core/message/236176
> Mute This Topic: https://lists.openembedded.org/mt/119084300/924729
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> ticotimo@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Dan McGregor April 30, 2026, 5:59 p.m. UTC | #3 
On Thu, 30 Apr 2026 at 11:51, Tim Orling <ticotimo@gmail.com> wrote:
>
>
>
> On Thu, Apr 30, 2026 at 9:18 AM Dan McGregor via lists.openembedded.org <danismostlikely=gmail.com@lists.openembedded.org> wrote:
>>
>> From: Dan McGregor <dan.mcgregor@vecima.com>
>>
>> OE Core includes chardet 6.0, while requests warns for any version
>> greater than or equal to 6.0. Not for any real reason, but because
>> it was a higher version than what was released when requests 2.32
>> was released.
>>
>
> For "master" we should upgrade to 2.33.1 which is the latest release and includes this patch:
> https://github.com/psf/requests/compare/v2.32.5...v2.33.1
>
> For 'wrynose' we should use the backport, but there is also a bump to chardet < 8 that merged:
> https://github.com/psf/requests/commit/b2a1d33f571518ca9a6148e7da787cc5827f897a

Oh I agree about master. This was intended for wrynose for now, since
it's either released or close to it.
And it was both < 8 and < 7 that merged, I cherry-picked the first
one. The link above is one after my cherry-pick below. I'm not opposed
to cherry-picking both though in one patch.

>>
>> Signed-off-by: Dan McGregor <dan.mcgregor@vecima.com>
>> ---
>>  ...01-Increase-chardet-upper-limit-to-7.patch | 26 +++++++++++++++++++
>>  .../python/python3-requests_2.32.5.bb         |  1 +
>>  2 files changed, 27 insertions(+)
>>  create mode 100644 meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch
>>
>> diff --git a/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch b/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch
>> new file mode 100644
>> index 00000000000..2c445e42549
>> --- /dev/null
>> +++ b/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch
>> @@ -0,0 +1,26 @@
>> +From 0f965846b95d096d76a1795db37fbe9acad0eb65 Mon Sep 17 00:00:00 2001
>> +From: Amin Vakil <info@aminvakil.com>
>> +Date: Sun, 22 Feb 2026 19:37:16 +0330
>> +Subject: [PATCH] Increase chardet upper limit to 7
>> +
>> +Upstream-Status: Backport [https://github.com/psf/requests/commit/4bd79e397304d46dfccd76f36c07f66c0295ff82]
>> +---
>> + src/requests/__init__.py | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/src/requests/__init__.py b/src/requests/__init__.py
>> +index 051cda13..9a80c625 100644
>> +--- a/src/requests/__init__.py
>> ++++ b/src/requests/__init__.py
>> +@@ -76,7 +76,7 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
>> +         major, minor, patch = chardet_version.split(".")[:3]
>> +         major, minor, patch = int(major), int(minor), int(patch)
>> +         # chardet_version >= 3.0.2, < 6.0.0
>> +-        assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0)
>> ++        assert (3, 0, 2) <= (major, minor, patch) < (7, 0, 0)
>> +     elif charset_normalizer_version:
>> +         major, minor, patch = charset_normalizer_version.split(".")[:3]
>> +         major, minor, patch = int(major), int(minor), int(patch)
>> +--
>> +2.44.4
>> +
>> diff --git a/meta/recipes-devtools/python/python3-requests_2.32.5.bb b/meta/recipes-devtools/python/python3-requests_2.32.5.bb
>> index 3477a5d83e9..02d476e975f 100644
>> --- a/meta/recipes-devtools/python/python3-requests_2.32.5.bb
>> +++ b/meta/recipes-devtools/python/python3-requests_2.32.5.bb
>> @@ -8,6 +8,7 @@ inherit pypi python_setuptools_build_meta
>>  SRC_URI[sha256sum] = "dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf"
>>
>>  SRC_URI += "file://CVE-2026-25645.patch"
>> +SRC_URI += "file://0001-Increase-chardet-upper-limit-to-7.patch"
>>  SRC_URI:append:class-nativesdk = " file://environment.d-python3-requests.sh"
>>
>>  do_install:append:class-nativesdk() {
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#236176): https://lists.openembedded.org/g/openembedded-core/message/236176
>> Mute This Topic: https://lists.openembedded.org/mt/119084300/924729
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ticotimo@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch b/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch
new file mode 100644
index 00000000000..2c445e42549
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-requests/0001-Increase-chardet-upper-limit-to-7.patch
@@ -0,0 +1,26 @@ 
+From 0f965846b95d096d76a1795db37fbe9acad0eb65 Mon Sep 17 00:00:00 2001
+From: Amin Vakil <info@aminvakil.com>
+Date: Sun, 22 Feb 2026 19:37:16 +0330
+Subject: [PATCH] Increase chardet upper limit to 7
+
+Upstream-Status: Backport [https://github.com/psf/requests/commit/4bd79e397304d46dfccd76f36c07f66c0295ff82]
+---
+ src/requests/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/requests/__init__.py b/src/requests/__init__.py
+index 051cda13..9a80c625 100644
+--- a/src/requests/__init__.py
++++ b/src/requests/__init__.py
+@@ -76,7 +76,7 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
+         major, minor, patch = chardet_version.split(".")[:3]
+         major, minor, patch = int(major), int(minor), int(patch)
+         # chardet_version >= 3.0.2, < 6.0.0
+-        assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0)
++        assert (3, 0, 2) <= (major, minor, patch) < (7, 0, 0)
+     elif charset_normalizer_version:
+         major, minor, patch = charset_normalizer_version.split(".")[:3]
+         major, minor, patch = int(major), int(minor), int(patch)
+-- 
+2.44.4
+
diff --git a/meta/recipes-devtools/python/python3-requests_2.32.5.bb b/meta/recipes-devtools/python/python3-requests_2.32.5.bb
index 3477a5d83e9..02d476e975f 100644
--- a/meta/recipes-devtools/python/python3-requests_2.32.5.bb
+++ b/meta/recipes-devtools/python/python3-requests_2.32.5.bb
@@ -8,6 +8,7 @@  inherit pypi python_setuptools_build_meta
 SRC_URI[sha256sum] = "dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf"
 
 SRC_URI += "file://CVE-2026-25645.patch"
+SRC_URI += "file://0001-Increase-chardet-upper-limit-to-7.patch"
 SRC_URI:append:class-nativesdk = " file://environment.d-python3-requests.sh"
 
 do_install:append:class-nativesdk() {