ports
/
contrib
3
3
Fork 2
Code Issues Pull Requests Activity

python3-yaml: cherry-picked commit for python3-cython 3.0

This commit is contained in:
Tim Biermann 2023-07-23 17:02:48 +02:00
parent 33349a914e
commit df9c47dbf8
4 changed files with 75 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
python3-yaml/.footprint
View File

@ -2,53 +2,36 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/python3.10/
drwxr-xr-x root/root usr/lib/python3.10/site-packages/
drwxr-xr-x root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1-py3.10.egg-info/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1-py3.10.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1-py3.10.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1-py3.10.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1-py3.10.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1.dist-info/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1.dist-info/LICENSE
-rw-r--r-- root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1.dist-info/METADATA
-rw-r--r-- root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1.dist-info/RECORD
-rw-r--r-- root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1.dist-info/WHEEL
-rw-r--r-- root/root usr/lib/python3.10/site-packages/PyYAML-6.0.1.dist-info/top_level.txt
drwxr-xr-x root/root usr/lib/python3.10/site-packages/_yaml/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/_yaml/__init__.py
drwxr-xr-x root/root usr/lib/python3.10/site-packages/_yaml/__pycache__/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/_yaml/__pycache__/__init__.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/_yaml/__pycache__/__init__.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/_yaml/__pycache__/__init__.cpython-310.opt-2.pyc
drwxr-xr-x root/root usr/lib/python3.10/site-packages/yaml/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__init__.py
drwxr-xr-x root/root usr/lib/python3.10/site-packages/yaml/__pycache__/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/__init__.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/__init__.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/composer.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/composer.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/constructor.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/constructor.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/cyaml.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/cyaml.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/dumper.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/dumper.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/emitter.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/emitter.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/error.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/error.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/events.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/events.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/loader.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/loader.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/nodes.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/nodes.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/parser.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/parser.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/reader.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/reader.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/representer.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/representer.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/resolver.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/resolver.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/scanner.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/scanner.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/serializer.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/serializer.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/tokens.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/tokens.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/__init__.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/composer.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/constructor.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/cyaml.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/dumper.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/emitter.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/error.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/events.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/loader.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/nodes.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/parser.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/reader.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/representer.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/resolver.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/scanner.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/serializer.cpython-310.opt-2.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/__pycache__/tokens.cpython-310.opt-2.pyc
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/yaml/_yaml.cpython-310-x86_64-linux-gnu.so
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/composer.py
-rw-r--r-- root/root usr/lib/python3.10/site-packages/yaml/constructor.py

7
python3-yaml/.signature
View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF37aZYTIby/C44KaWcqFCFigY4aw0MO2IAGClNHUy6Jg2zyKX3roWNnCvPo8ExFfbnxKKFnUeN21JZHThCo1XfQE=
SHA256 (Pkgfile) = 2b6aa6ede34412eb66c91c901033707c495250ca24843a383fa8274b85879448
SHA256 (.footprint) = 8e09496165100a890577aee6abae070e0f6a6a02ca0f311969619063f0717e7d
RWSagIOpLGJF3zbXQ8YRMppxd1Tr9yKN4mGluZi5vaacXAcVjtP8+AVZso7dWgefx6lC8IzEi/JNbWvKRVsnT/AGZGbs924Tug0=
SHA256 (Pkgfile) = 7a75fd458ae76d5a6909593c9b0b56748750952619f223c120ebf5ae5fff47a9
SHA256 (.footprint) = 1785c7c35f450f116f4fe5f50e630d8910212f9e8cc70f4498803db62e65c6cb
SHA256 (PyYAML-6.0.1.tar.gz) = bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43
SHA256 (731.patch) = ae874252aedc33ebd414f6cc1d32f73292be73257af6a205c8a3e83321a0e6b7

39
python3-yaml/731.patch Normal file
View File

@ -0,0 +1,39 @@
From 17dc5b6cd96dcfe64fd71789c771ca9b96d260e5 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>
---
setup.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 944e7fa2..462b1e95 100644
--- 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:

18
python3-yaml/Pkgfile
View File

@ -5,17 +5,15 @@
name=python3-yaml
version=6.0.1
release=1
source=(https://pypi.python.org/packages/source/P/PyYAML/PyYAML-$version.tar.gz)
#source=(https://github.com/yaml/pyyaml/archive/$version/PyYAML-$version.tar.gz)
release=2
source=(https://pypi.python.org/packages/source/P/PyYAML/PyYAML-$version.tar.gz
731.patch)
build() {
#cd pyyaml-$version
cd PyYAML-$version
/usr/bin/python3 setup.py --with-libyaml build
/usr/bin/python3 setup.py --with-libyaml install \
--prefix=/usr \
--root=$PKG \
-O1 \
--skip-build
patch -Np1 -i $SRC/731.patch
/usr/bin/python3 -m build --wheel --skip-dependency-check --no-isolation
/usr/bin/python3 -m installer --compile-bytecode 2 --destdir=$PKG dist/*.whl
}