diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2024-08-27 07:23:35 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-08-28 09:14:26 +0100 |
| commit | ac87a6889713fea375c10e56f9bc35d755435c23 (patch) | |
| tree | da9f5b207b34dde0ebfbed6147e561e42d8bfac7 /meta/recipes-devtools/python/python3-pyyaml | |
| parent | 48c5cf7500d585f313c25a039ad671277b8f1223 (diff) | |
| download | poky-ac87a6889713fea375c10e56f9bc35d755435c23.tar.gz | |
python3-pyyaml: update 6.0.1 -> 6.0.2
With this release, cython 3.x is finally officially supported.
(From OE-Core rev: 4ea0c1eb42624ea142dd3d319d2bf750eb1af764)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3-pyyaml')
| -rw-r--r-- | meta/recipes-devtools/python/python3-pyyaml/0001-Fix-builds-with-Cython-3.patch | 54 |
1 files changed, 0 insertions, 54 deletions
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 a87d588b6a..0000000000 --- a/meta/recipes-devtools/python/python3-pyyaml/0001-Fix-builds-with-Cython-3.patch +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | From 9cc23db56add79357b8f8257fe6fc0d6879d4579 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Andrew J. Hesford" <ajh@sideband.org> | ||
| 3 | Date: Fri, 21 Jul 2023 09:50:00 -0400 | ||
| 4 | Subject: [PATCH] Fix builds with Cython 3 | ||
| 5 | |||
| 6 | This is a *de minimis* fix for building with Cython 3. Recent Cython<3 | ||
| 7 | releases provided `Cython.Distutils.build_ext` as an alias to | ||
| 8 | `Cython.Distutils.old_build_ext.old_build_ext`; Cython 3 drops this | ||
| 9 | alias and instead uses a wholly new `Cython.Distutils.build_ext` that | ||
| 10 | does not provide the `cython_sources` function used in `setup.py`. | ||
| 11 | |||
| 12 | Explicitly importing `old_build_ext` preserves the existing behavior for | ||
| 13 | recent Cython<3 and uses the correct behavior for Cython 3. Should the | ||
| 14 | import fail (*e.g.*, because the version of Cython available predates | ||
| 15 | the availability of `old_build_ext`), the import falls back to just | ||
| 16 | `Cython.Distutils.build_ext`. | ||
| 17 | |||
| 18 | Signed-off-by: Andrew J. Hesford <ajh@sideband.org> | ||
| 19 | Upstream-Status: Denied [https://github.com/yaml/pyyaml/pull/731] | ||
| 20 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 21 | --- | ||
| 22 | pyproject.toml | 2 +- | ||
| 23 | setup.py | 6 +++++- | ||
| 24 | 2 files changed, 6 insertions(+), 2 deletions(-) | ||
| 25 | |||
| 26 | diff --git a/pyproject.toml b/pyproject.toml | ||
| 27 | index 4bc04c0..2bf5ec8 100644 | ||
| 28 | --- a/pyproject.toml | ||
| 29 | +++ b/pyproject.toml | ||
| 30 | @@ -1,3 +1,3 @@ | ||
| 31 | [build-system] | ||
| 32 | -requires = ["setuptools", "wheel", "Cython<3.0"] | ||
| 33 | +requires = ["setuptools", "wheel", "Cython"] | ||
| 34 | build-backend = "setuptools.build_meta" | ||
| 35 | diff --git a/setup.py b/setup.py | ||
| 36 | index 65b0ea0..4461580 100644 | ||
| 37 | --- a/setup.py | ||
| 38 | +++ b/setup.py | ||
| 39 | @@ -82,7 +82,11 @@ if 'sdist' in sys.argv or os.environ.get('PYYAML_FORCE_CYTHON') == '1': | ||
| 40 | with_cython = True | ||
| 41 | try: | ||
| 42 | from Cython.Distutils.extension import Extension as _Extension | ||
| 43 | - from Cython.Distutils import build_ext as _build_ext | ||
| 44 | + try: | ||
| 45 | + from Cython.Distutils.old_build_ext import old_build_ext as _build_ext | ||
| 46 | + except ImportError: | ||
| 47 | + from Cython.Distutils import build_ext as _build_ext | ||
| 48 | + | ||
| 49 | with_cython = True | ||
| 50 | except ImportError: | ||
| 51 | if with_cython: | ||
| 52 | -- | ||
| 53 | 2.39.2 | ||
| 54 | |||
