Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Conner Clere (fab8b2befc547e56fee0cdd9ff824dfc5abcff70)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Conner Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Conner Clere (fab8b2befc547e56fee0cdd9ff824dfc5abcff70)
  • Date: Thu, 9 May 2024 00:46:29 +0000

GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:

python-pypi/pyyaml/DETAILS | 1
python-pypi/pyyaml/HISTORY | 5 ++
python-pypi/pyyaml/PRE_BUILD | 3 +
python-pypi/pyyaml/patches/pyyaml-6.0.1-cython3.patch | 40
++++++++++++++++++
4 files changed, 49 insertions(+)

New commits:
commit fab8b2befc547e56fee0cdd9ff824dfc5abcff70
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

python-pypi/pyyaml: fix build with cython 3

added PATCHLEVEL=1 to force an update

diff --git a/python-pypi/pyyaml/DETAILS b/python-pypi/pyyaml/DETAILS
index f0b793f..ae57155 100755
--- a/python-pypi/pyyaml/DETAILS
+++ b/python-pypi/pyyaml/DETAILS
@@ -1,6 +1,7 @@
SPELL=pyyaml
VERSION=6.0.1
SECURITY_PATCH=2
+ PATCHLEVEL=1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/yaml/pyyaml/archive/$VERSION.tar.gz

SOURCE_HASH=sha512:1c74a92a4ad7d47854dc7bcb2e89b3c8e0b14fa815c7dbfbc22b24480dbba6c81e971c77ee384c494a960914b95f06edf943d7431925a5ed674a0ba830d258e0
diff --git a/python-pypi/pyyaml/HISTORY b/python-pypi/pyyaml/HISTORY
index 223337e..e325dc6 100644
--- a/python-pypi/pyyaml/HISTORY
+++ b/python-pypi/pyyaml/HISTORY
@@ -1,3 +1,8 @@
+2024-05-08 Conner Clere <xenanthropy AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1 added
+ * PRE_BUILD: added, patch files
+ * patches/pyyaml-6.0.1-cython3.patch: added, fix build with cython 3
+
2023-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 6.0.1

diff --git a/python-pypi/pyyaml/PRE_BUILD b/python-pypi/pyyaml/PRE_BUILD
new file mode 100755
index 0000000..1a25f9f
--- /dev/null
+++ b/python-pypi/pyyaml/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/patches/pyyaml-6.0.1-cython3.patch
diff --git a/python-pypi/pyyaml/patches/pyyaml-6.0.1-cython3.patch
b/python-pypi/pyyaml/patches/pyyaml-6.0.1-cython3.patch
new file mode 100644
index 0000000..8c288c7
--- /dev/null
+++ b/python-pypi/pyyaml/patches/pyyaml-6.0.1-cython3.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/898680
+https://github.com/yaml/pyyaml/pull/731
+
+From 17dc5b6cd96dcfe64fd71789c771ca9b96d260e5 Mon Sep 17 00:00:00 2001
+From: "Andrew J. Hesford" <ajh AT 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 AT sideband.org>
+
+### Source Mage ###
+Signed-off-by: Conner Clere <xenanthropy AT sourcemage.org>
+###################
+--- a/setup.py
++++ b/setup.py
+@@ -82,7 +82,11 @@
+ 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:


  • [[SM-Commit] ] GIT changes to master grimoire by Conner Clere (fab8b2befc547e56fee0cdd9ff824dfc5abcff70), Conner Clere, 05/08/2024

Archive powered by MHonArc 2.6.24.

Top of Page