Skip to contentSkip to conversation

python3-charset-normalizer: add patch for setuptools version

PATCH New Jason Schonberg 1 participant 1 message Aug 11

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 python3-charset-normalizer: add patch for setuptools version

The 3.4.9 upgrade dropped the setuptools uppper-bound patch because upstream raised its cap from <82.1 to <83.1. But oe-core ships setuptools 84.0.0, so do_compile failed with Unmet dependencies: setuptools<83.1,>=68 ... found: 84.0.0

Refreshed patch to match 3.4.9's pyproject.toml

---
 .../0001-pyproject.toml-relax-setuptools-upper-bound.patch    | 4 ++--
 .../python/python3-charset-normalizer_3.4.9.bb                | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
meta-python/recipes-devtools/python/python3-charset-normalizer/0001-pyproject.toml-relax-setuptools-upper-bound.patch +2 -2
index 8d9ee26d8f..508debc340 100644
@@ -5,7 +5,7 @@ Subject: [PATCH] pyproject.toml: relax setuptools upper bound
 
 OE provides setuptools via DEPENDS and builds with --no-isolation, so the
 upstream upper cap on setuptools is spurious and breaks the build whenever
-oe-core ships a newer setuptools (currently 83.0.0).
+oe-core ships a newer setuptools (currently 84.0.0).
 
 Upstream-Status: Inappropriate [oe-core specific setuptools version]
 Signed-off-by: Khem Raj <[email protected]>
@@ -19,6 +19,6 @@ index 1111111..2222222 100644
 +++ b/pyproject.toml
 @@ -1,3 +1,3 @@
  [build-system]
--requires = ["setuptools>=68,<82.1"]
+-requires = ["setuptools>=68,<83.1"]
 +requires = ["setuptools>=68"]
  build-backend = "backend"
meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.9.bb +1 -0
index 70dcb9e158..6df52a23d4 100644
@@ -3,6 +3,7 @@ HOMEPAGE = "https://github.com/ousret/charset_normalizer"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=48178f3fc1374ad7e830412f812bde05"
 
+SRC_URI += "file://0001-pyproject.toml-relax-setuptools-upper-bound.patch"
 SRC_URI[sha256sum] = "673611bbd43f0810bec0b0f028ddeaaa501190339cac411f347ac76917c3ae7b"
 
 DEPENDS += "python3-setuptools-scm-native python3-mypy-native"
Signature · 1 line
2.43.0