From 629fe4ee301ec9a2e6d59e5fb4c4c2887e1a9056 Mon Sep 17 00:00:00 2001 From: Thomas Roos Date: Sun, 8 Nov 2026 20:26:06 +0100 Subject: [PATCH] python3-propcache: upgrade 0.4.1 -> 0.5.4 Needed together with the Cython 3.3.1 upgrade in OE-Core: 0.4.1, with the backported "Update Cython to version 3.2.3" patch, requires Cython ~= 3.2.0 and does not build with Cython 3.3. Home Assistant 2026.11 also pins propcache 0.5.4. Drop both local patches: - 0001-Update-Cython-to-version-3.2.3-184.patch backported the change from Cython ~= 3.1.0 to Cython ~= 3.2.0. 0.5.4 requires Cython >= 3.2.0 (packaging/pep517_backend/_backend.py), so the backport is not needed; it would even pin the build back to Cython ~= 3.2.0. - 0001-build-wheel-in-place.patch hardcoded build_inplace=True in the in-tree build backend. 0.5.4 adds the build-inplace config setting for this, so the recipe passes "-C build-inplace=true" in PEP517_BUILD_OPTS instead. AI-Generated: Claude Code, Claude Opus 5.5 Signed-off-by: Thomas Roos Signed-off-by: Khem Raj --- ...1-Update-Cython-to-version-3.2.3-184.patch | 33 ------------------- .../0001-build-wheel-in-place.patch | 31 ----------------- ...he_0.4.1.bb => python3-propcache_0.5.4.bb} | 8 ++--- 3 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-propcache/0001-Update-Cython-to-version-3.2.3-184.patch delete mode 100644 meta-python/recipes-devtools/python/python3-propcache/0001-build-wheel-in-place.patch rename meta-python/recipes-devtools/python/{python3-propcache_0.4.1.bb => python3-propcache_0.5.4.bb} (68%) diff --git a/meta-python/recipes-devtools/python/python3-propcache/0001-Update-Cython-to-version-3.2.3-184.patch b/meta-python/recipes-devtools/python/python3-propcache/0001-Update-Cython-to-version-3.2.3-184.patch deleted file mode 100644 index 26c4a2b20a..0000000000 --- a/meta-python/recipes-devtools/python/python3-propcache/0001-Update-Cython-to-version-3.2.3-184.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 049909ed3db8527aaae86a15d3c7998988ea77a0 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Mon, 29 Dec 2025 13:21:12 -0700 -Subject: [PATCH] Update Cython to version 3.2.3 (#184) - -Upstream-Status: Backport [https://github.com/aio-libs/propcache/pull/184] -Co-authored-by: J. Nick Koston -Signed-off-by: Khem Raj ---- - packaging/pep517_backend/_backend.py | 2 +- - requirements/cython.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/packaging/pep517_backend/_backend.py b/packaging/pep517_backend/_backend.py -index ce79c4e..e05a9dd 100644 ---- a/packaging/pep517_backend/_backend.py -+++ b/packaging/pep517_backend/_backend.py -@@ -376,7 +376,7 @@ def get_requires_for_build_wheel( - if is_pure_python_build: - c_ext_build_deps = [] - else: -- c_ext_build_deps = ['Cython ~= 3.1.0'] -+ c_ext_build_deps = ['Cython ~= 3.2.0'] - - return _setuptools_get_requires_for_build_wheel( - config_settings=config_settings, -diff --git a/requirements/cython.txt b/requirements/cython.txt -index 97dc5a1..209c15a 100644 ---- a/requirements/cython.txt -+++ b/requirements/cython.txt -@@ -1 +1 @@ --cython==3.1.4 -+cython==3.2.3 diff --git a/meta-python/recipes-devtools/python/python3-propcache/0001-build-wheel-in-place.patch b/meta-python/recipes-devtools/python/python3-propcache/0001-build-wheel-in-place.patch deleted file mode 100644 index 84f81da775..0000000000 --- a/meta-python/recipes-devtools/python/python3-propcache/0001-build-wheel-in-place.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 606843ad079d9d0dac1172533d42b5a2327b99ed Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Wed, 17 Sep 2025 15:41:09 +0800 -Subject: [PATCH] build wheel in place - -In order to make the generated library be reproducible, build wheel -in source dir other than tmp dir (/tmp/xxxxxx), then yocto toolchain's -option -fdebug-prefix-map could work as expected - -Upstream-Status: Pending -Signed-off-by: Hongxu Jia ---- - packaging/pep517_backend/_backend.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/packaging/pep517_backend/_backend.py b/packaging/pep517_backend/_backend.py -index 61cad34..d5d839e 100644 ---- a/packaging/pep517_backend/_backend.py -+++ b/packaging/pep517_backend/_backend.py -@@ -316,7 +316,7 @@ def build_wheel( - """ - with maybe_prebuild_c_extensions( - line_trace_cython_when_unset=False, -- build_inplace=False, -+ build_inplace=True, - config_settings=config_settings, - ): - return _setuptools_build_wheel( --- -2.34.1 - diff --git a/meta-python/recipes-devtools/python/python3-propcache_0.4.1.bb b/meta-python/recipes-devtools/python/python3-propcache_0.5.4.bb similarity index 68% rename from meta-python/recipes-devtools/python/python3-propcache_0.4.1.bb rename to meta-python/recipes-devtools/python/python3-propcache_0.5.4.bb index 4f681613aa..a931791660 100644 --- a/meta-python/recipes-devtools/python/python3-propcache_0.4.1.bb +++ b/meta-python/recipes-devtools/python/python3-propcache_0.5.4.bb @@ -3,14 +3,12 @@ HOMEPAGE = "https://github.com/aio-libs/propcache" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "f48107a8c637e80362555f37ecf49abe20370e557cc4ab374f04ec4423c97c3d" +SRC_URI[sha256sum] = "ff6b113f50bc066a698db5d944d2c6dc7507168dd3341e255a8892fd0715a558" inherit pypi python_setuptools_build_meta ptest-python-pytest cython -SRC_URI += " \ - file://0001-build-wheel-in-place.patch \ - file://0001-Update-Cython-to-version-3.2.3-184.patch \ -" +# Build the C extensions in the source tree instead of a temporary copy +PEP517_BUILD_OPTS += "-C build-inplace=true" DEPENDS += " \ python3-expandvars-native \