diff mbox series

python3-urllib3: enable setuptools-scm 10.x

Message ID 20260424184105.5627-1-tgamblin@baylibre.com
State Under Review
Headers show
Series python3-urllib3: enable setuptools-scm 10.x | expand

Commit Message

Trevor Gamblin April 24, 2026, 6:41 p.m. UTC 
Backport a patch from upstream to allow python3-urllib3 2.6.3 to build
with python3-setuptools-scm 10.x, so that we can use an updated version
of that recipe.

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
 ...ml-remove-setuptools-scm-upper-limit.patch | 30 +++++++++++++++++++
 .../python/python3-urllib3_2.6.3.bb           |  4 +++
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-urllib3/0001-pyproject.toml-remove-setuptools-scm-upper-limit.patch
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3-urllib3/0001-pyproject.toml-remove-setuptools-scm-upper-limit.patch b/meta/recipes-devtools/python/python3-urllib3/0001-pyproject.toml-remove-setuptools-scm-upper-limit.patch
new file mode 100644
index 0000000000..62c7e3d68d
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-urllib3/0001-pyproject.toml-remove-setuptools-scm-upper-limit.patch
@@ -0,0 +1,30 @@ 
+From 7a4a7fddff72413bac190ad14bca8fca2d1461e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 1 Apr 2026 19:09:22 +0200
+Subject: [PATCH] Allow using setuptools_scm 10 (#4954)
+
+Upstream-Status: Backport [https://github.com/urllib3/urllib3/commit/166f66faa5ef23e255f654e8c6b66ad8590fe630]
+
+It works in Fedora, so I hope it will work upstream as well.
+
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 45538a6e..d2607c78 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,7 +1,7 @@
+ # This file is protected via CODEOWNERS
+ 
+ [build-system]
+-requires = ["hatchling>=1.27.0,<2", "hatch-vcs>=0.4.0,<0.6.0", "setuptools-scm>=8,<10"]
++requires = ["hatchling>=1.27.0,<2", "hatch-vcs>=0.4.0,<0.6.0", "setuptools-scm>=8,<11"]
+ build-backend = "hatchling.build"
+ 
+ [project]
+-- 
+2.53.0
+
diff --git a/meta/recipes-devtools/python/python3-urllib3_2.6.3.bb b/meta/recipes-devtools/python/python3-urllib3_2.6.3.bb
index e63791a8f4..b8028efece 100644
--- a/meta/recipes-devtools/python/python3-urllib3_2.6.3.bb
+++ b/meta/recipes-devtools/python/python3-urllib3_2.6.3.bb
@@ -5,6 +5,10 @@  LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda"
 
 SRC_URI[sha256sum] = "1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed"
 
+SRC_URI += "\
+    file://0001-pyproject.toml-remove-setuptools-scm-upper-limit.patch \
+"
+
 inherit pypi python_hatchling
 
 DEPENDS += "python3-hatch-vcs-native"