From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 15/34] python3-pyyaml: update 6.0.1 -> 6.0.2
Date: Tue, 27 Aug 2024 07:23:35 +0200 [thread overview]
Message-ID: <20240827052354.1319810-15-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20240827052354.1319810-1-alex.kanavin@gmail.com>
From: Alexander Kanavin <alex@linutronix.de>
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
next prev parent reply other threads:[~2024-08-27 5:24 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-27 5:23 [PATCH 01/34] selftest: always tweak ERROR_QA/WARN_QA per package Alexander Kanavin
2024-08-27 5:23 ` [PATCH 02/34] selftest: use INIT_MANAGER to enable systemd instead of custom settings Alexander Kanavin
2024-08-27 5:23 ` [PATCH 03/34] xmlto: check upstream version tags, not new commits Alexander Kanavin
2024-08-27 5:23 ` [PATCH 04/34] glib-2.0: update 2.80.2 -> 2.80.4 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 05/34] lttng-modules: update 2.13.13 -> 2.13.14 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 06/34] automake: update 1.16.5 -> 1.17 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 07/34] fmt: update 10.2.1 -> 11.0.2 Alexander Kanavin
2024-08-28 18:16 ` [OE-core] " Khem Raj
2024-08-27 5:23 ` [PATCH 08/34] git: 2.45.2 -> 2.46.0 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 09/34] perlcross: update 1.5.2 -> 1.6 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 10/34] perl: update 5.38.2 -> 5.40.0 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 11/34] gnu-config: update to latest revision Alexander Kanavin
2024-08-27 5:23 ` [PATCH 12/34] python3-license-expression: update 30.3.0 -> 30.3.1 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 13/34] python3-pip: 24.0 -> 24.2 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 14/34] python3-pyopenssl: update 24.1.0 -> 24.2.1 Alexander Kanavin
2024-08-27 5:23 ` Alexander Kanavin [this message]
2024-08-27 5:23 ` [PATCH 16/34] python3-scons: update 4.7.0 -> 4.8.0 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 17/34] cargo-c-native: update 0.9.30 -> 0.10.3 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 18/34] go-helloworld: update to latest revision Alexander Kanavin
2024-08-27 5:23 ` [PATCH 19/34] vulkan-samples: " Alexander Kanavin
2024-08-27 5:23 ` [PATCH 20/34] ffmpeg: update 6.1.1 -> 7.0.2 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 21/34] libksba: update 1.6.6 -> 1.6.7 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 22/34] p11-kit: update 0.25.3 -> 0.25.5 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 23/34] iproute2: upgrade 6.9.0 -> 6.10.0 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 24/34] ifupdown: upgrade 0.8.41 -> 0.8.43 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 25/34] libdnf: upgrade 0.73.2 -> 0.73.3 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 26/34] mmc-utils: upgrade to latest revision Alexander Kanavin
2024-08-27 5:23 ` [PATCH 27/34] adwaita-icon-theme: upgrade 46.0 -> 46.2 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 28/34] hicolor-icon-theme: upgrade 0.17 -> 0.18 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 29/34] waffle: upgrade 1.8.0 -> 1.8.1 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 30/34] libtraceevent: upgrade 1.8.2 -> 1.8.3 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 31/34] alsa-utils: upgrade 1.2.11 -> 1.2.12 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 32/34] lz4: upgrade 1.9.4 -> 1.10.0 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 33/34] vte: upgrade 0.74.2 -> 0.76.3 Alexander Kanavin
2024-08-27 5:23 ` [PATCH 34/34] cracklib: update 2.9.11 -> 2.10.2 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240827052354.1319810-15-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=alex@linutronix.de \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox