From 0c2ae63fd808a11c3d2b76b25db9537e924e90c7 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 8 Jan 2022 17:54:57 +0100 Subject: dev-python/cython: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/cython/Manifest | 3 - dev-python/cython/cython-0.29.21.ebuild | 81 -------- dev-python/cython/cython-0.29.23.ebuild | 78 -------- dev-python/cython/cython-0.29.24-r1.ebuild | 77 -------- .../files/cython-0.29.14-sphinx-update.patch | 13 -- .../cython-0.29.21-spawn-multiprocessing.patch | 29 --- .../files/cython-0.29.23-tracing-py310.patch | 213 --------------------- .../cython-0.29.24-test-failure-warning.patch | 20 -- .../files/cython-0.29.24-unaligned-format.patch | 33 ---- 9 files changed, 547 deletions(-) delete mode 100644 dev-python/cython/cython-0.29.21.ebuild delete mode 100644 dev-python/cython/cython-0.29.23.ebuild delete mode 100644 dev-python/cython/cython-0.29.24-r1.ebuild delete mode 100644 dev-python/cython/files/cython-0.29.14-sphinx-update.patch delete mode 100644 dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch delete mode 100644 dev-python/cython/files/cython-0.29.23-tracing-py310.patch delete mode 100644 dev-python/cython/files/cython-0.29.24-test-failure-warning.patch delete mode 100644 dev-python/cython/files/cython-0.29.24-unaligned-format.patch (limited to 'dev-python/cython') diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest index 94d3b6198bde..deb61b54af02 100644 --- a/dev-python/cython/Manifest +++ b/dev-python/cython/Manifest @@ -1,5 +1,2 @@ -DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679 -DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a -DIST cython-0.29.24.gh.tar.gz 2097245 BLAKE2B 9f5f2da0aed61d7fda2e14ea0669a2dd187cd053f3b82621342c7be29e26ff581b673a32e43bacd5c0df3e515f250eb23a64b1dae8911132fdca48175910a3dc SHA512 387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8 DIST cython-0.29.25.gh.tar.gz 2100012 BLAKE2B 497c2550c870c808f1c972d3e9ffedd6672544b9976653faac4a4125008e4472ae5a2e0db0510c8b2c5fd11f73a5885e0e4394bbce2f1327b7610bf59b64f640 SHA512 1d655bb4de8bd3480bcd579c32cd0e5bfc5cfc3d966d3d892b98cc86f59c9bd0522066c4c5dbc4c6abeb3ebe3fcd3f49ec873dd724f9ad04976635f652fdf9e3 DIST cython-0.29.26.gh.tar.gz 2100616 BLAKE2B 9990d8fd14a8042b1a27a4f60fcc8f6d4be42a1e475f0e5d37bc6c60439ca00a1a70b49ab708ad2dfac5184a62c25d75f27ff158ef7f0df9132355c570a9aac6 SHA512 936449dd0031c2e2baeb4402a448d632324c1b66bf062ae0e632cf63dc27556607efb8446e8f913253b761627d3946283c2a60fdcad8c2434e1601fe4b0fb60e diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild deleted file mode 100644 index bb017b7e2557..000000000000 --- a/dev-python/cython/cython-0.29.21.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 toolchain-funcs elisp-common - -DESCRIPTION="A Python to C compiler" -HOMEPAGE="https://cython.org https://pypi.org/project/Cython/ - https://github.com/cython/cython" -SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" -IUSE="emacs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - emacs? ( >=app-editors/emacs-23.1:* ) -" -BDEPEND="${RDEPEND} - test? ( - $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ - python3_{6,7,8}) - )" - -PATCHES=( - "${FILESDIR}/cython-0.29.14-sphinx-update.patch" - "${FILESDIR}/cython-0.29.21-spawn-multiprocessing.patch" -) - -SITEFILE=50cython-gentoo.el - -distutils_enable_sphinx docs - -python_compile() { - if ! python_is_python3; then - local CFLAGS="${CFLAGS} -fno-strict-aliasing" - local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - fi - - # Python gets confused when it is in sys.path before build. - local -x PYTHONPATH= - - distutils-r1_python_compile -} - -python_compile_all() { - use emacs && elisp-compile Tools/cython-mode.el -} - -python_test() { - tc-export CC - # https://github.com/cython/cython/issues/1911 - local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) - distutils-r1_python_install_all - - if use emacs; then - elisp-install ${PN} Tools/cython-mode.* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-python/cython/cython-0.29.23.ebuild b/dev-python/cython/cython-0.29.23.ebuild deleted file mode 100644 index bce6983a00f2..000000000000 --- a/dev-python/cython/cython-0.29.23.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..10} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 toolchain-funcs elisp-common - -DESCRIPTION="A Python to C compiler" -HOMEPAGE="https://cython.org https://pypi.org/project/Cython/ - https://github.com/cython/cython" -SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" -IUSE="emacs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - emacs? ( >=app-editors/emacs-23.1:* ) -" -BDEPEND="${RDEPEND} - test? ( - $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ - 'python3*') - )" - -PATCHES=( - "${FILESDIR}/${PN}-0.29.14-sphinx-update.patch" - "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" - "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" - "${FILESDIR}/${PN}-0.29.23-tracing-py310.patch" -) - -SITEFILE=50cython-gentoo.el - -distutils_enable_sphinx docs - -python_compile() { - # Python gets confused when it is in sys.path before build. - local -x PYTHONPATH= - - distutils-r1_python_compile -} - -python_compile_all() { - use emacs && elisp-compile Tools/cython-mode.el -} - -python_test() { - tc-export CC - # https://github.com/cython/cython/issues/1911 - local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) - distutils-r1_python_install_all - - if use emacs; then - elisp-install ${PN} Tools/cython-mode.* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-python/cython/cython-0.29.24-r1.ebuild b/dev-python/cython/cython-0.29.24-r1.ebuild deleted file mode 100644 index f613ee176918..000000000000 --- a/dev-python/cython/cython-0.29.24-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7..10} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 toolchain-funcs elisp-common - -DESCRIPTION="A Python to C compiler" -HOMEPAGE="https://cython.org https://pypi.org/project/Cython/ - https://github.com/cython/cython" -SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" -IUSE="emacs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - emacs? ( >=app-editors/emacs-23.1:* ) -" -BDEPEND="${RDEPEND} - test? ( - $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ - 'python3*') - )" - -PATCHES=( - "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" - "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" - "${FILESDIR}/${PN}-0.29.24-unaligned-format.patch" - "${FILESDIR}/${PN}-0.29.24-test-failure-warning.patch" -) - -SITEFILE=50cython-gentoo.el - -distutils_enable_sphinx docs - -python_compile() { - # Python gets confused when it is in sys.path before build. - local -x PYTHONPATH= - - distutils-r1_python_compile -} - -python_compile_all() { - use emacs && elisp-compile Tools/cython-mode.el -} - -python_test() { - tc-export CC - # https://github.com/cython/cython/issues/1911 - local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests || - die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) - distutils-r1_python_install_all - - if use emacs; then - elisp-install ${PN} Tools/cython-mode.* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-python/cython/files/cython-0.29.14-sphinx-update.patch b/dev-python/cython/files/cython-0.29.14-sphinx-update.patch deleted file mode 100644 index 3f426754f6f1..000000000000 --- a/dev-python/cython/files/cython-0.29.14-sphinx-update.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/docs/conf.py b/docs/conf.py -index 10662e28c..a84e0b928 100644 ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -41,7 +41,7 @@ highlight_language = 'cython' - extensions = [ - 'ipython_console_highlighting', - 'cython_highlighting', -- 'sphinx.ext.pngmath', -+ 'sphinx.ext.imgmath', - 'sphinx.ext.todo', - 'sphinx.ext.intersphinx', - 'sphinx.ext.autodoc' diff --git a/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch b/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch deleted file mode 100644 index 0aa7212b9a34..000000000000 --- a/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch +++ /dev/null @@ -1,29 +0,0 @@ -Needed to prevent a loop while calling cythonize on macOS - or any platform -defaulting to the 'spawn' method, as Python 3.8 does on Darwin. - -https://github.com/cython/cython/pull/3263 -From 15ae78bb74a856836dd64828326f4f0812d36520 Mon Sep 17 00:00:00 2001 -From: Marcel Bargull -Date: Fri, 6 Dec 2019 18:21:19 +0100 -Subject: [PATCH] Disable parallel cythonization for "spawn" start method. - ---- - Cython/Build/Dependencies.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Cython/Build/Dependencies.py b/Cython/Build/Dependencies.py -index 593e00a6ef..f9b9c15bc5 100644 ---- a/Cython/Build/Dependencies.py -+++ b/Cython/Build/Dependencies.py -@@ -1073,6 +1073,11 @@ def copy_to_build_dir(filepath, root=os.getcwd()): - - if N <= 1: - nthreads = 0 -+ if nthreads: -+ import multiprocessing -+ if multiprocessing.get_start_method() == 'spawn': -+ print('Disabling parallel cythonization for "spawn" process start method.') -+ nthreads = 0 - if nthreads: - import multiprocessing - pool = multiprocessing.Pool( diff --git a/dev-python/cython/files/cython-0.29.23-tracing-py310.patch b/dev-python/cython/files/cython-0.29.23-tracing-py310.patch deleted file mode 100644 index ff0e45a646dc..000000000000 --- a/dev-python/cython/files/cython-0.29.23-tracing-py310.patch +++ /dev/null @@ -1,213 +0,0 @@ -From c9cccfeaf3f0e20c2bb14fc234e86f4fc8e4fe81 Mon Sep 17 00:00:00 2001 -From: Stefan Behnel -Date: Fri, 14 May 2021 19:39:58 +0200 -Subject: [PATCH] Adapt tracing code to Py3.10 beta 1. - ---- - Cython/Utility/Profile.c | 79 +++++++++++++++++++++++++--------------- - 1 file changed, 49 insertions(+), 30 deletions(-) - -diff --git a/Cython/Utility/Profile.c b/Cython/Utility/Profile.c -index 15ceb41cc2..2cd9af9da7 100644 ---- a/Cython/Utility/Profile.c -+++ b/Cython/Utility/Profile.c -@@ -47,13 +47,32 @@ - #define CYTHON_FRAME_DEL(frame) Py_CLEAR(frame) - #endif - -- #define __Pyx_TraceDeclarations \ -- static PyCodeObject *$frame_code_cname = NULL; \ -- CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL; \ -- int __Pyx_use_tracing = 0; -+ #define __Pyx_TraceDeclarations \ -+ static PyCodeObject *$frame_code_cname = NULL; \ -+ CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL; \ -+ int __Pyx_use_tracing = 0; - -- #define __Pyx_TraceFrameInit(codeobj) \ -- if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj; -+ #define __Pyx_TraceFrameInit(codeobj) \ -+ if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj; -+ -+#if PY_VERSION_HEX >= 0x030a00b1 -+ #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \ -+ (unlikely(tstate->cframe->use_tracing) && \ -+ (!(check_tracing) || !tstate->tracing) && \ -+ (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) -+ -+ #define __Pyx_SetTracing(tstate, enable) \ -+ (tstate)->cframe->use_tracing = (enable) -+ -+#else -+ #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \ -+ (unlikely(tstate->use_tracing) && \ -+ (!(check_tracing) || !tstate->tracing) && \ -+ (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) -+ -+ #define __Pyx_SetTracing(tstate, enable) \ -+ (tstate)->use_tracing = (enable) -+#endif - - #ifdef WITH_THREAD - #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error) \ -@@ -62,8 +81,7 @@ - PyThreadState *tstate; \ - PyGILState_STATE state = PyGILState_Ensure(); \ - tstate = __Pyx_PyThreadState_Current; \ -- if (unlikely(tstate->use_tracing) && !tstate->tracing && \ -- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ -+ if (__Pyx_IsTracing(tstate, 1, 1)) { \ - __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno); \ - } \ - PyGILState_Release(state); \ -@@ -71,8 +89,7 @@ - } \ - } else { \ - PyThreadState* tstate = PyThreadState_GET(); \ -- if (unlikely(tstate->use_tracing) && !tstate->tracing && \ -- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ -+ if (__Pyx_IsTracing(tstate, 1, 1)) { \ - __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno); \ - if (unlikely(__Pyx_use_tracing < 0)) goto_error; \ - } \ -@@ -80,8 +97,7 @@ - #else - #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error) \ - { PyThreadState* tstate = PyThreadState_GET(); \ -- if (unlikely(tstate->use_tracing) && !tstate->tracing && \ -- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ -+ if (__Pyx_IsTracing(tstate, 1, 1)) { \ - __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno); \ - if (unlikely(__Pyx_use_tracing < 0)) goto_error; \ - } \ -@@ -91,10 +107,9 @@ - #define __Pyx_TraceException() \ - if (likely(!__Pyx_use_tracing)); else { \ - PyThreadState* tstate = __Pyx_PyThreadState_Current; \ -- if (tstate->use_tracing && \ -- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ -+ if (__Pyx_IsTracing(tstate, 0, 1)) { \ - tstate->tracing++; \ -- tstate->use_tracing = 0; \ -+ __Pyx_SetTracing(tstate, 0); \ - PyObject *exc_info = __Pyx_GetExceptionTuple(tstate); \ - if (exc_info) { \ - if (CYTHON_TRACE && tstate->c_tracefunc) \ -@@ -104,7 +119,7 @@ - tstate->c_profileobj, $frame_cname, PyTrace_EXCEPTION, exc_info); \ - Py_DECREF(exc_info); \ - } \ -- tstate->use_tracing = 1; \ -+ __Pyx_SetTracing(tstate, 1); \ - tstate->tracing--; \ - } \ - } -@@ -113,13 +128,13 @@ - PyObject *type, *value, *traceback; - __Pyx_ErrFetchInState(tstate, &type, &value, &traceback); - tstate->tracing++; -- tstate->use_tracing = 0; -+ __Pyx_SetTracing(tstate, 0); - if (CYTHON_TRACE && tstate->c_tracefunc) - tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_RETURN, result); - if (tstate->c_profilefunc) - tstate->c_profilefunc(tstate->c_profileobj, frame, PyTrace_RETURN, result); - CYTHON_FRAME_DEL(frame); -- tstate->use_tracing = 1; -+ __Pyx_SetTracing(tstate, 1); - tstate->tracing--; - __Pyx_ErrRestoreInState(tstate, type, value, traceback); - } -@@ -132,14 +147,14 @@ - PyThreadState *tstate; \ - PyGILState_STATE state = PyGILState_Ensure(); \ - tstate = __Pyx_PyThreadState_Current; \ -- if (tstate->use_tracing) { \ -+ if (__Pyx_IsTracing(tstate, 0, 0)) { \ - __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result); \ - } \ - PyGILState_Release(state); \ - } \ - } else { \ - PyThreadState* tstate = __Pyx_PyThreadState_Current; \ -- if (tstate->use_tracing) { \ -+ if (__Pyx_IsTracing(tstate, 0, 0)) { \ - __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result); \ - } \ - } \ -@@ -148,7 +163,7 @@ - #define __Pyx_TraceReturn(result, nogil) \ - if (likely(!__Pyx_use_tracing)); else { \ - PyThreadState* tstate = __Pyx_PyThreadState_Current; \ -- if (tstate->use_tracing) { \ -+ if (__Pyx_IsTracing(tstate, 0, 0)) { \ - __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result); \ - } \ - } -@@ -176,9 +191,11 @@ - __Pyx_ErrFetchInState(tstate, &type, &value, &traceback); - __Pyx_PyFrame_SetLineNumber(frame, lineno); - tstate->tracing++; -- tstate->use_tracing = 0; -+ __Pyx_SetTracing(tstate, 0); -+ - ret = tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_LINE, NULL); -- tstate->use_tracing = 1; -+ -+ __Pyx_SetTracing(tstate, 1); - tstate->tracing--; - if (likely(!ret)) { - __Pyx_ErrRestoreInState(tstate, type, value, traceback); -@@ -199,7 +216,7 @@ - PyThreadState *tstate; \ - PyGILState_STATE state = __Pyx_PyGILState_Ensure(); \ - tstate = __Pyx_PyThreadState_Current; \ -- if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \ -+ if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \ - ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno); \ - } \ - __Pyx_PyGILState_Release(state); \ -@@ -207,7 +224,7 @@ - } \ - } else { \ - PyThreadState* tstate = __Pyx_PyThreadState_Current; \ -- if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \ -+ if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \ - int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno); \ - if (unlikely(ret)) goto_error; \ - } \ -@@ -217,7 +234,7 @@ - #define __Pyx_TraceLine(lineno, nogil, goto_error) \ - if (likely(!__Pyx_use_tracing)); else { \ - PyThreadState* tstate = __Pyx_PyThreadState_Current; \ -- if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \ -+ if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \ - int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno); \ - if (unlikely(ret)) goto_error; \ - } \ -@@ -263,19 +280,21 @@ static int __Pyx_TraceSetupAndCall(PyCodeObject** code, - (*frame)->f_tstate = tstate; - #endif - } -- __Pyx_PyFrame_SetLineNumber(*frame, firstlineno); -+ __Pyx_PyFrame_SetLineNumber(*frame, firstlineno); -+ - retval = 1; - tstate->tracing++; -- tstate->use_tracing = 0; -+ __Pyx_SetTracing(tstate, 0); - __Pyx_ErrFetchInState(tstate, &type, &value, &traceback); -+ - #if CYTHON_TRACE - if (tstate->c_tracefunc) - retval = tstate->c_tracefunc(tstate->c_traceobj, *frame, PyTrace_CALL, NULL) == 0; - if (retval && tstate->c_profilefunc) - #endif - retval = tstate->c_profilefunc(tstate->c_profileobj, *frame, PyTrace_CALL, NULL) == 0; -- tstate->use_tracing = (tstate->c_profilefunc || -- (CYTHON_TRACE && tstate->c_tracefunc)); -+ -+ __Pyx_SetTracing(tstate, (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))); - tstate->tracing--; - if (retval) { - __Pyx_ErrRestoreInState(tstate, type, value, traceback); diff --git a/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch b/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch deleted file mode 100644 index 64202a93ecad..000000000000 --- a/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/cython/cython/commit/bf4979e2441ffbc9aaeb88f5c67608578040588f -https://bugs.gentoo.org/739516 - -From: Stefan Behnel -Date: Sat, 3 Apr 2021 08:23:44 +0200 -Subject: [PATCH] Make a helper function in a C++ test correctly propagate - exceptions so that it won't have to spit out compiler warnings. - ---- a/tests/run/cpp_stl_conversion.pyx -+++ b/tests/run/cpp_stl_conversion.pyx -@@ -15,7 +15,7 @@ py_set = set - py_xrange = xrange - py_unicode = unicode - --cdef string add_strings(string a, string b): -+cdef string add_strings(string a, string b) except *: - return a + b - - def normalize(bytes b): - diff --git a/dev-python/cython/files/cython-0.29.24-unaligned-format.patch b/dev-python/cython/files/cython-0.29.24-unaligned-format.patch deleted file mode 100644 index 955c32debb49..000000000000 --- a/dev-python/cython/files/cython-0.29.24-unaligned-format.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2c08fd50d62e4255602ee3c0d41157df7608e773 Mon Sep 17 00:00:00 2001 -From: Stefan Behnel -Date: Wed, 1 Sep 2021 00:09:02 +0200 -Subject: [PATCH] Avoid copying unaligned 16-bit values since some platforms - require them to be aligned. Use memcpy() instead to let the C compiler decide - how to do it. - -Closes https://github.com/cython/cython/issues/4343 ---- - Cython/Utility/TypeConversion.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Cython/Utility/TypeConversion.c b/Cython/Utility/TypeConversion.c -index 751d12b62a..3669bc9ec1 100644 ---- a/Cython/Utility/TypeConversion.c -+++ b/Cython/Utility/TypeConversion.c -@@ -829,14 +829,14 @@ static CYTHON_INLINE PyObject* {{TO_PY_FUNCTION}}({{TYPE}} value, Py_ssize_t wid - digit_pos = abs((int)(remaining % (8*8))); - remaining = ({{TYPE}}) (remaining / (8*8)); - dpos -= 2; -- *(uint16_t*)dpos = ((const uint16_t*)DIGIT_PAIRS_8)[digit_pos]; /* copy 2 digits at a time */ -+ memcpy(dpos, DIGIT_PAIRS_8 + digit_pos * 2, 2); /* copy 2 digits at a time, unaligned */ - last_one_off = (digit_pos < 8); - break; - case 'd': - digit_pos = abs((int)(remaining % (10*10))); - remaining = ({{TYPE}}) (remaining / (10*10)); - dpos -= 2; -- *(uint16_t*)dpos = ((const uint16_t*)DIGIT_PAIRS_10)[digit_pos]; /* copy 2 digits at a time */ -+ memcpy(dpos, DIGIT_PAIRS_10 + digit_pos * 2, 2); /* copy 2 digits at a time, unaligned */ - last_one_off = (digit_pos < 10); - break; - case 'x': -- cgit v1.2.3-65-gdbad