diff options
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/cysignals/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/cysignals/cysignals-1.11.4-r1.ebuild | 41 | ||||
| -rw-r--r-- | dev-python/cysignals/cysignals-1.12.0-r1.ebuild | 34 | ||||
| -rw-r--r-- | dev-python/cysignals/files/cysignals-1.11.4-helper.patch | 85 | ||||
| -rw-r--r-- | dev-python/cysignals/files/cysignals-1.12.0-fix-building-against-me.patch | 74 |
5 files changed, 0 insertions, 236 deletions
diff --git a/dev-python/cysignals/Manifest b/dev-python/cysignals/Manifest index f849a71e782c..2380a22c410c 100644 --- a/dev-python/cysignals/Manifest +++ b/dev-python/cysignals/Manifest @@ -1,3 +1 @@ -DIST cysignals-1.11.4.tar.gz 105100 BLAKE2B c21c5cae69332885dd4b9f13d0fbe9ab836466dd699f0d51908d129107ce4922f4076fafa8dce3650983fd69d25182464f9831545a8da3535699d36d198ec6a7 SHA512 b083a62bcca71634cdd21ca6c8d1363e7754ed97d6f2ad0280b0ae97fdf1264be3dc202acf67added4c12a0815420d9641269da1212b83472ea304883d3b85ab -DIST cysignals-1.12.0.tar.gz 65857 BLAKE2B 4a9bb56c8491814480a9deae053eb13574b480245418c743b1a99cc4fbe4c784c35e8518707cd6ced22174f032444e38daee16ab933b044f8942da2d1c47cfab SHA512 c4575f9d07f4d4c1c27a2e953b12693758babe79000fe62e2423ae484695f0ee813ebc2868ec74aa6c2c4e85d074c3a0db1524ad4ca58e1250fd1d4ca8386692 DIST cysignals-1.12.2.tar.gz 65828 BLAKE2B dff532fb0c95abe53331082c88f79edd3a7136501c2015272d83e0a5d29b51e26c007b06f3e4ead42eaa306c1219ccc207827dc58ff954514ebd7fdc47dd2d02 SHA512 9cbf3eb4a11724949f513b4409d136b0890f987f9a5d3c3324b12bddd85eb7226dd793a5b2ec383e9ee46fa59e55f9ca19b0fb4c02e0b6eab46e01607668a8cb diff --git a/dev-python/cysignals/cysignals-1.11.4-r1.ebuild b/dev-python/cysignals/cysignals-1.11.4-r1.ebuild deleted file mode 100644 index 7940ad35c445..000000000000 --- a/dev-python/cysignals/cysignals-1.11.4-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Interrupt and signal handling for Cython" -HOMEPAGE=" - https://github.com/sagemath/cysignals/ - https://pypi.org/project/cysignals/ -" - -# setup.py has "or later" -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="amd64 ~riscv" - -DEPEND=" - sci-mathematics/pari:= -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - >=dev-python/cython-3.0.0[${PYTHON_USEDEP}] -" - -PATCHES=( - # https://github.com/sagemath/cysignals/pull/204 - "${FILESDIR}/${P}-helper.patch" -) - -python_test(){ - local -x PATH="${BUILD_DIR}/scripts:${PATH}" - "${EPYTHON}" -B rundoctests.py src/cysignals/*.pyx || die -} diff --git a/dev-python/cysignals/cysignals-1.12.0-r1.ebuild b/dev-python/cysignals/cysignals-1.12.0-r1.ebuild deleted file mode 100644 index fe0f2f6b4ac6..000000000000 --- a/dev-python/cysignals/cysignals-1.12.0-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Interrupt and signal handling for Cython" -HOMEPAGE=" - https://github.com/sagemath/cysignals/ - https://pypi.org/project/cysignals/ -" - -# setup.py has "or later" -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~riscv" - -BDEPEND=" - >=dev-python/cython-3.0.0[${PYTHON_USEDEP}] -" - -PATCHES=( "${FILESDIR}/${P}-fix-building-against-me.patch" ) - -distutils_enable_tests pytest - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -} diff --git a/dev-python/cysignals/files/cysignals-1.11.4-helper.patch b/dev-python/cysignals/files/cysignals-1.11.4-helper.patch deleted file mode 100644 index 0c09f236eccb..000000000000 --- a/dev-python/cysignals/files/cysignals-1.11.4-helper.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 2abd7ef94775b3320b6f1954b55168e06da0e6b3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 6 Jul 2024 13:06:49 +0200 -Subject: [PATCH] Install cysignals-CSI-helper as package data for better - portability - -Rather than installing `cysignals-CSI-helper.py` into a `share` -directory and then trying to figure out the correct path to it, install -it as Python package data and use the standard `importlib.resources` -API to access it. For Python versions older than 3.9, -the `importlib_resources` backport is used instead. - -Fixes #200 ---- - setup.py | 4 +++- - .../cysignals-CSI-helper.py | 0 - src/scripts/cysignals-CSI | 20 ++++++++++--------- - 3 files changed, 14 insertions(+), 10 deletions(-) - rename src/{scripts => cysignals}/cysignals-CSI-helper.py (100%) - -diff --git a/setup.py b/setup.py -index 7953170..7154a4a 100755 ---- a/setup.py -+++ b/setup.py -@@ -215,7 +215,6 @@ setup( - packages=["cysignals"], - package_dir={"": "src"}, - package_data={"cysignals": ["*.pxd", "*.h"]}, -- data_files=[(opj("share", "cysignals"), [opj("src", "scripts", "cysignals-CSI-helper.py")])], - scripts=glob(opj("src", "scripts", "cysignals-CSI")), - cmdclass=dict( - configure=configure, -@@ -223,4 +222,7 @@ setup( - build_ext=build_ext, - bdist_egg=no_egg - ), -+ install_requires=[ -+ "importlib_resources; python_version < '3.9'", -+ ], - ) -diff --git a/src/scripts/cysignals-CSI-helper.py b/src/cysignals/cysignals-CSI-helper.py -similarity index 100% -rename from src/scripts/cysignals-CSI-helper.py -rename to src/cysignals/cysignals-CSI-helper.py -diff --git a/src/scripts/cysignals-CSI b/src/scripts/cysignals-CSI -index dd8b4e6..3896dca 100755 ---- a/src/scripts/cysignals-CSI -+++ b/src/scripts/cysignals-CSI -@@ -41,6 +41,11 @@ from argparse import ArgumentParser - from datetime import datetime - from distutils.spawn import find_executable - -+if sys.version_info >= (3, 9): -+ import importlib.resources as importlib_resources -+else: -+ import importlib_resources -+ - - def pid_exists(pid): - """ -@@ -65,15 +70,12 @@ def gdb_commands(pid, color): - cmds += b'import sys; sys.stdout.flush()\n' - cmds += b'end\n' - cmds += b'bt full\n' -- cysignals_share = os.path.join(os.path.dirname(sys.argv[0]), '..', -- 'share', 'cysignals') -- script = os.path.join(cysignals_share, 'cysignals-CSI-helper.py') -- with open(script, 'rb') as f: -- cmds += b'python\n' -- cmds += b'color = %r; ' % color -- cmds += b'sys_path = %r; ' % sys.path -- cmds += f.read() -- cmds += b'end\n' -+ script = importlib_resources.files('cysignals') / 'cysignals-CSI-helper.py' -+ cmds += b'python\n' -+ cmds += b'color = %r; ' % color -+ cmds += b'sys_path = %r; ' % sys.path -+ cmds += script.read_bytes() -+ cmds += b'end\n' - cmds += b'detach inferior 1\n' - cmds += b'quit\n' - return cmds --- -2.45.2 - diff --git a/dev-python/cysignals/files/cysignals-1.12.0-fix-building-against-me.patch b/dev-python/cysignals/files/cysignals-1.12.0-fix-building-against-me.patch deleted file mode 100644 index a305936838d0..000000000000 --- a/dev-python/cysignals/files/cysignals-1.12.0-fix-building-against-me.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 7c05d63f87e6f7b9c3366939a6494aa3335381e8 Mon Sep 17 00:00:00 2001 -From: Ludo Pulles <ludo.pulles@gmail.com> -Date: Fri, 6 Dec 2024 13:18:28 +0100 -Subject: [PATCH] Fix build issues - ---- - example/meson.build | 7 ------- - meson.build | 5 ----- - src/cysignals/signals.pxd | 1 + - src/cysignals/signals.pyx | 1 + - src/cysignals/tests.pyx | 1 + - 5 files changed, 3 insertions(+), 12 deletions(-) - -diff --git a/example/meson.build b/example/meson.build -index e40c614..ae3e120 100644 ---- a/example/meson.build -+++ b/example/meson.build -@@ -15,13 +15,6 @@ print(cysignals.__file__.replace('__init__.py', '')) - ).stdout().strip() - cysignals = declare_dependency(include_directories: inc_cysignals) - --# Make declarations in Cython code available to C include files --add_project_arguments( -- '-X preliminary_late_includes_cy28=True', -- language: 'cython', --) -- -- - py.extension_module('cysignals_example', - sources: ['cysignals_example.pyx'], - install: true, -diff --git a/meson.build b/meson.build -index d66145b..5209bf2 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,11 +22,6 @@ add_project_arguments('-DCYTHON_CLINE_IN_TRACEBACK=0', language: 'c') - # Disable sanity checking in GNU libc - # This is required because of false positives in the longjmp() check - add_project_arguments('-U_FORTIFY_SOURCE', language: 'c') --# Make declarations in Cython code available to C include files --add_project_arguments( -- '-X preliminary_late_includes_cy28=True', -- language: 'cython', --) - - # Platform-specific settings - if is_cygwin -diff --git a/src/cysignals/signals.pxd b/src/cysignals/signals.pxd -index 76320f7..531a9a8 100644 ---- a/src/cysignals/signals.pxd -+++ b/src/cysignals/signals.pxd -@@ -1,3 +1,4 @@ -+# cython: preliminary_late_includes_cy28=True - #***************************************************************************** - # cysignals is free software: you can redistribute it and/or modify it - # under the terms of the GNU Lesser General Public License as published -diff --git a/src/cysignals/signals.pyx b/src/cysignals/signals.pyx -index b988167..72f206e 100644 ---- a/src/cysignals/signals.pyx -+++ b/src/cysignals/signals.pyx -@@ -1,3 +1,4 @@ -+# cython: preliminary_late_includes_cy28=True - r""" - Interrupt and signal handling - -diff --git a/src/cysignals/tests.pyx b/src/cysignals/tests.pyx -index 547095f..ffb04ca 100644 ---- a/src/cysignals/tests.pyx -+++ b/src/cysignals/tests.pyx -@@ -1,3 +1,4 @@ -+# cython: preliminary_late_includes_cy28=True - """ - Test interrupt and signal handling - |
