From 69e42c4fbd164ad7e63b92869e6ac5ff2ccc8b92 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Mar 2026 15:10:52 -0700 Subject: python3-charset-normalizer: Upgrade to 3.4.6 Fix build with setuptools > 82.0.0 as well Signed-off-by: Khem Raj --- ...projects-Bump-setuptools-check-to-be-82.x.patch | 25 ++++++++++++++++++++++ .../python/python3-charset-normalizer_3.4.5.bb | 25 ---------------------- .../python/python3-charset-normalizer_3.4.6.bb | 25 ++++++++++++++++++++++ 3 files changed, 50 insertions(+), 25 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python3-charset-normalizer/0001-pyprojects-Bump-setuptools-check-to-be-82.x.patch delete mode 100644 meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.5.bb create mode 100644 meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.6.bb (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python3-charset-normalizer/0001-pyprojects-Bump-setuptools-check-to-be-82.x.patch b/meta-python/recipes-devtools/python/python3-charset-normalizer/0001-pyprojects-Bump-setuptools-check-to-be-82.x.patch new file mode 100644 index 0000000000..571333e44e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-charset-normalizer/0001-pyprojects-Bump-setuptools-check-to-be-82.x.patch @@ -0,0 +1,25 @@ +From 17bc1de2c08f9303886d654572b1ba64259a8a68 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 20 Mar 2026 15:06:51 -0700 +Subject: [PATCH] pyprojects: Bump setuptools check to be <= 82.x + +This ensures build with 82.0.1 goes on + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index ea1c514..bbc83b7 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["setuptools>=68,<=82.0.0"] ++requires = ["setuptools>=68,<=83.0.0"] + build-backend = "backend" + backend-path = ["_mypyc_hook"] + diff --git a/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.5.bb b/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.5.bb deleted file mode 100644 index e69d7536a9..0000000000 --- a/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.5.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -HOMEPAGE = "https://github.com/ousret/charset_normalizer" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=48178f3fc1374ad7e830412f812bde05" - -#SRC_URI += "file://0001-pyproject.toml-Update-mypy-requirement.patch" - -SRC_URI[sha256sum] = "95adae7b6c42a6c5b5b559b1a99149f090a57128155daeea91732c8d970d8644" - -DEPENDS += "python3-setuptools-scm-native python3-mypy-native" - -inherit pypi python_setuptools_build_meta ptest-python-pytest - -PYPI_PACKAGE = "charset_normalizer" -UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" - -RDEPENDS:${PN} += " \ - python3-core \ - python3-logging \ - python3-codecs \ - python3-json \ -" - -RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-charmap-gb18030 glibc-charmaps" -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.6.bb b/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.6.bb new file mode 100644 index 0000000000..e6056a3512 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.6.bb @@ -0,0 +1,25 @@ +SUMMARY = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." +HOMEPAGE = "https://github.com/ousret/charset_normalizer" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=48178f3fc1374ad7e830412f812bde05" + +SRC_URI += "file://0001-pyprojects-Bump-setuptools-check-to-be-82.x.patch" + +SRC_URI[sha256sum] = "1ae6b62897110aa7c79ea2f5dd38d1abca6db663687c0b1ad9aed6f6bae3d9d6" + +DEPENDS += "python3-setuptools-scm-native python3-mypy-native" + +inherit pypi python_setuptools_build_meta ptest-python-pytest + +PYPI_PACKAGE = "charset_normalizer" +UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" + +RDEPENDS:${PN} += " \ + python3-core \ + python3-logging \ + python3-codecs \ + python3-json \ +" + +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-charmap-gb18030 glibc-charmaps" +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf