[PATCH 15/34] python3-pyyaml: update 6.0.1 -> 6.0.2

Alexander Kanavin
2024-08-27T05:24:08Z

With this release, cython 3.x is finally officially supported.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../0001-Fix-builds-with-Cython-3.patch | 54 -------------------
...yyaml_6.0.1.bb => python3-pyyaml_6.0.2.bb} | 6 +--
2 files changed, 2 insertions(+), 58 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3-pyyaml/0001-Fix-builds-with-Cython-3.patch
rename meta/recipes-devtools/python/{python3-pyyaml_6.0.1.bb => python3-pyyaml_6.0.2.bb} (84%)

diff --git a/meta/recipes-devtools/python/python3-pyyaml/0001-Fix-builds-with-Cython-3.patch b/meta/recipes-devtools/python/python3-pyyaml/0001-Fix-builds-with-Cython-3.patch
deleted file mode 100644
index a87d588b6a1..00000000000
--- a/meta/recipes-devtools/python/python3-pyyaml/0001-Fix-builds-with-Cython-3.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9cc23db56add79357b8f8257fe6fc0d6879d4579 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <ajh@sideband.org>
-Date: Fri, 21 Jul 2023 09:50:00 -0400
-Subject: [PATCH] Fix builds with Cython 3
-
-This is a *de minimis* fix for building with Cython 3. Recent Cython<3
-releases provided `Cython.Distutils.build_ext` as an alias to
-`Cython.Distutils.old_build_ext.old_build_ext`; Cython 3 drops this
-alias and instead uses a wholly new `Cython.Distutils.build_ext` that
-does not provide the `cython_sources` function used in `setup.py`.
-
-Explicitly importing `old_build_ext` preserves the existing behavior for
-recent Cython<3 and uses the correct behavior for Cython 3. Should the
-import fail (*e.g.*, because the version of Cython available predates
-the availability of `old_build_ext`), the import falls back to just
-`Cython.Distutils.build_ext`.
-
-Signed-off-by: Andrew J. Hesford <ajh@sideband.org>
-Upstream-Status: Denied [https://github.com/yaml/pyyaml/pull/731]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- pyproject.toml | 2 +-
- setup.py | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 4bc04c0..2bf5ec8 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,3 +1,3 @@
- [build-system]
--requires = ["setuptools", "wheel", "Cython<3.0"]
-+requires = ["setuptools", "wheel", "Cython"]
- build-backend = "setuptools.build_meta"
-diff --git a/setup.py b/setup.py
-index 65b0ea0..4461580 100644
---- a/setup.py
-+++ b/setup.py
-@@ -82,7 +82,11 @@ if 'sdist' in sys.argv or os.environ.get('PYYAML_FORCE_CYTHON') == '1':
- with_cython = True
- try:
- from Cython.Distutils.extension import Extension as _Extension
-- from Cython.Distutils import build_ext as _build_ext
-+ try:
-+ from Cython.Distutils.old_build_ext import old_build_ext as _build_ext
-+ except ImportError:
-+ from Cython.Distutils import build_ext as _build_ext
-+
- with_cython = True
- except ImportError:
- if with_cython:
---
-2.39.2
-
diff --git a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb b/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb
similarity index 84%
rename from meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb
rename to meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb
index 6e2022719c1..a41d073af95 100644
--- a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb
+++ b/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb
@@ -5,12 +5,10 @@ HOMEPAGE = "https://pyyaml.org/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=6d8242660a8371add5fe547adf083079"

-PYPI_PACKAGE = "PyYAML"
-
inherit pypi python_setuptools_build_meta

-SRC_URI += "file://0001-Fix-builds-with-Cython-3.patch"
-SRC_URI[sha256sum] = "bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"
+SRC_URI[sha256sum] = "d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e"
+UPSTREAM_CHECK_PYPI_PACKAGE = "PyYAML"

PACKAGECONFIG ?= "libyaml"
PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml"
--
2.39.2