1 |
commit: 0c2ae63fd808a11c3d2b76b25db9537e924e90c7 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 8 16:54:57 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 8 16:54:57 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2ae63f |
7 |
|
8 |
dev-python/cython: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/cython/Manifest | 3 - |
13 |
dev-python/cython/cython-0.29.21.ebuild | 81 -------- |
14 |
dev-python/cython/cython-0.29.23.ebuild | 78 -------- |
15 |
dev-python/cython/cython-0.29.24-r1.ebuild | 77 -------- |
16 |
.../files/cython-0.29.14-sphinx-update.patch | 13 -- |
17 |
.../cython-0.29.21-spawn-multiprocessing.patch | 29 --- |
18 |
.../files/cython-0.29.23-tracing-py310.patch | 213 --------------------- |
19 |
.../cython-0.29.24-test-failure-warning.patch | 20 -- |
20 |
.../files/cython-0.29.24-unaligned-format.patch | 33 ---- |
21 |
9 files changed, 547 deletions(-) |
22 |
|
23 |
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest |
24 |
index 94d3b6198bde..deb61b54af02 100644 |
25 |
--- a/dev-python/cython/Manifest |
26 |
+++ b/dev-python/cython/Manifest |
27 |
@@ -1,5 +1,2 @@ |
28 |
-DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679 |
29 |
-DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a |
30 |
-DIST cython-0.29.24.gh.tar.gz 2097245 BLAKE2B 9f5f2da0aed61d7fda2e14ea0669a2dd187cd053f3b82621342c7be29e26ff581b673a32e43bacd5c0df3e515f250eb23a64b1dae8911132fdca48175910a3dc SHA512 387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8 |
31 |
DIST cython-0.29.25.gh.tar.gz 2100012 BLAKE2B 497c2550c870c808f1c972d3e9ffedd6672544b9976653faac4a4125008e4472ae5a2e0db0510c8b2c5fd11f73a5885e0e4394bbce2f1327b7610bf59b64f640 SHA512 1d655bb4de8bd3480bcd579c32cd0e5bfc5cfc3d966d3d892b98cc86f59c9bd0522066c4c5dbc4c6abeb3ebe3fcd3f49ec873dd724f9ad04976635f652fdf9e3 |
32 |
DIST cython-0.29.26.gh.tar.gz 2100616 BLAKE2B 9990d8fd14a8042b1a27a4f60fcc8f6d4be42a1e475f0e5d37bc6c60439ca00a1a70b49ab708ad2dfac5184a62c25d75f27ff158ef7f0df9132355c570a9aac6 SHA512 936449dd0031c2e2baeb4402a448d632324c1b66bf062ae0e632cf63dc27556607efb8446e8f913253b761627d3946283c2a60fdcad8c2434e1601fe4b0fb60e |
33 |
|
34 |
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild |
35 |
deleted file mode 100644 |
36 |
index bb017b7e2557..000000000000 |
37 |
--- a/dev-python/cython/cython-0.29.21.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,81 +0,0 @@ |
40 |
-# Copyright 1999-2021 Gentoo Authors |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=7 |
44 |
- |
45 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
46 |
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) |
47 |
-PYTHON_REQ_USE="threads(+)" |
48 |
- |
49 |
-inherit distutils-r1 toolchain-funcs elisp-common |
50 |
- |
51 |
-DESCRIPTION="A Python to C compiler" |
52 |
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/ |
53 |
- https://github.com/cython/cython" |
54 |
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" |
55 |
- |
56 |
-LICENSE="Apache-2.0" |
57 |
-SLOT="0" |
58 |
-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" |
59 |
-IUSE="emacs test" |
60 |
-RESTRICT="!test? ( test )" |
61 |
- |
62 |
-RDEPEND=" |
63 |
- emacs? ( >=app-editors/emacs-23.1:* ) |
64 |
-" |
65 |
-BDEPEND="${RDEPEND} |
66 |
- test? ( |
67 |
- $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ |
68 |
- python3_{6,7,8}) |
69 |
- )" |
70 |
- |
71 |
-PATCHES=( |
72 |
- "${FILESDIR}/cython-0.29.14-sphinx-update.patch" |
73 |
- "${FILESDIR}/cython-0.29.21-spawn-multiprocessing.patch" |
74 |
-) |
75 |
- |
76 |
-SITEFILE=50cython-gentoo.el |
77 |
- |
78 |
-distutils_enable_sphinx docs |
79 |
- |
80 |
-python_compile() { |
81 |
- if ! python_is_python3; then |
82 |
- local CFLAGS="${CFLAGS} -fno-strict-aliasing" |
83 |
- local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" |
84 |
- fi |
85 |
- |
86 |
- # Python gets confused when it is in sys.path before build. |
87 |
- local -x PYTHONPATH= |
88 |
- |
89 |
- distutils-r1_python_compile |
90 |
-} |
91 |
- |
92 |
-python_compile_all() { |
93 |
- use emacs && elisp-compile Tools/cython-mode.el |
94 |
-} |
95 |
- |
96 |
-python_test() { |
97 |
- tc-export CC |
98 |
- # https://github.com/cython/cython/issues/1911 |
99 |
- local -x CFLAGS="${CFLAGS} -fno-strict-overflow" |
100 |
- "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ |
101 |
- || die "Tests fail with ${EPYTHON}" |
102 |
-} |
103 |
- |
104 |
-python_install_all() { |
105 |
- local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) |
106 |
- distutils-r1_python_install_all |
107 |
- |
108 |
- if use emacs; then |
109 |
- elisp-install ${PN} Tools/cython-mode.* |
110 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
111 |
- fi |
112 |
-} |
113 |
- |
114 |
-pkg_postinst() { |
115 |
- use emacs && elisp-site-regen |
116 |
-} |
117 |
- |
118 |
-pkg_postrm() { |
119 |
- use emacs && elisp-site-regen |
120 |
-} |
121 |
|
122 |
diff --git a/dev-python/cython/cython-0.29.23.ebuild b/dev-python/cython/cython-0.29.23.ebuild |
123 |
deleted file mode 100644 |
124 |
index bce6983a00f2..000000000000 |
125 |
--- a/dev-python/cython/cython-0.29.23.ebuild |
126 |
+++ /dev/null |
127 |
@@ -1,78 +0,0 @@ |
128 |
-# Copyright 1999-2021 Gentoo Authors |
129 |
-# Distributed under the terms of the GNU General Public License v2 |
130 |
- |
131 |
-EAPI=7 |
132 |
- |
133 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
134 |
-PYTHON_COMPAT=( python3_{7..10} pypy3 ) |
135 |
-PYTHON_REQ_USE="threads(+)" |
136 |
- |
137 |
-inherit distutils-r1 toolchain-funcs elisp-common |
138 |
- |
139 |
-DESCRIPTION="A Python to C compiler" |
140 |
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/ |
141 |
- https://github.com/cython/cython" |
142 |
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" |
143 |
- |
144 |
-LICENSE="Apache-2.0" |
145 |
-SLOT="0" |
146 |
-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" |
147 |
-IUSE="emacs test" |
148 |
-RESTRICT="!test? ( test )" |
149 |
- |
150 |
-RDEPEND=" |
151 |
- emacs? ( >=app-editors/emacs-23.1:* ) |
152 |
-" |
153 |
-BDEPEND="${RDEPEND} |
154 |
- test? ( |
155 |
- $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ |
156 |
- 'python3*') |
157 |
- )" |
158 |
- |
159 |
-PATCHES=( |
160 |
- "${FILESDIR}/${PN}-0.29.14-sphinx-update.patch" |
161 |
- "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" |
162 |
- "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" |
163 |
- "${FILESDIR}/${PN}-0.29.23-tracing-py310.patch" |
164 |
-) |
165 |
- |
166 |
-SITEFILE=50cython-gentoo.el |
167 |
- |
168 |
-distutils_enable_sphinx docs |
169 |
- |
170 |
-python_compile() { |
171 |
- # Python gets confused when it is in sys.path before build. |
172 |
- local -x PYTHONPATH= |
173 |
- |
174 |
- distutils-r1_python_compile |
175 |
-} |
176 |
- |
177 |
-python_compile_all() { |
178 |
- use emacs && elisp-compile Tools/cython-mode.el |
179 |
-} |
180 |
- |
181 |
-python_test() { |
182 |
- tc-export CC |
183 |
- # https://github.com/cython/cython/issues/1911 |
184 |
- local -x CFLAGS="${CFLAGS} -fno-strict-overflow" |
185 |
- "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ |
186 |
- || die "Tests fail with ${EPYTHON}" |
187 |
-} |
188 |
- |
189 |
-python_install_all() { |
190 |
- local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) |
191 |
- distutils-r1_python_install_all |
192 |
- |
193 |
- if use emacs; then |
194 |
- elisp-install ${PN} Tools/cython-mode.* |
195 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
196 |
- fi |
197 |
-} |
198 |
- |
199 |
-pkg_postinst() { |
200 |
- use emacs && elisp-site-regen |
201 |
-} |
202 |
- |
203 |
-pkg_postrm() { |
204 |
- use emacs && elisp-site-regen |
205 |
-} |
206 |
|
207 |
diff --git a/dev-python/cython/cython-0.29.24-r1.ebuild b/dev-python/cython/cython-0.29.24-r1.ebuild |
208 |
deleted file mode 100644 |
209 |
index f613ee176918..000000000000 |
210 |
--- a/dev-python/cython/cython-0.29.24-r1.ebuild |
211 |
+++ /dev/null |
212 |
@@ -1,77 +0,0 @@ |
213 |
-# Copyright 1999-2021 Gentoo Authors |
214 |
-# Distributed under the terms of the GNU General Public License v2 |
215 |
- |
216 |
-EAPI=8 |
217 |
- |
218 |
-PYTHON_COMPAT=( python3_{7..10} pypy3 ) |
219 |
-PYTHON_REQ_USE="threads(+)" |
220 |
- |
221 |
-inherit distutils-r1 toolchain-funcs elisp-common |
222 |
- |
223 |
-DESCRIPTION="A Python to C compiler" |
224 |
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/ |
225 |
- https://github.com/cython/cython" |
226 |
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" |
227 |
- |
228 |
-LICENSE="Apache-2.0" |
229 |
-SLOT="0" |
230 |
-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" |
231 |
-IUSE="emacs test" |
232 |
-RESTRICT="!test? ( test )" |
233 |
- |
234 |
-RDEPEND=" |
235 |
- emacs? ( >=app-editors/emacs-23.1:* ) |
236 |
-" |
237 |
-BDEPEND="${RDEPEND} |
238 |
- test? ( |
239 |
- $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ |
240 |
- 'python3*') |
241 |
- )" |
242 |
- |
243 |
-PATCHES=( |
244 |
- "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" |
245 |
- "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" |
246 |
- "${FILESDIR}/${PN}-0.29.24-unaligned-format.patch" |
247 |
- "${FILESDIR}/${PN}-0.29.24-test-failure-warning.patch" |
248 |
-) |
249 |
- |
250 |
-SITEFILE=50cython-gentoo.el |
251 |
- |
252 |
-distutils_enable_sphinx docs |
253 |
- |
254 |
-python_compile() { |
255 |
- # Python gets confused when it is in sys.path before build. |
256 |
- local -x PYTHONPATH= |
257 |
- |
258 |
- distutils-r1_python_compile |
259 |
-} |
260 |
- |
261 |
-python_compile_all() { |
262 |
- use emacs && elisp-compile Tools/cython-mode.el |
263 |
-} |
264 |
- |
265 |
-python_test() { |
266 |
- tc-export CC |
267 |
- # https://github.com/cython/cython/issues/1911 |
268 |
- local -x CFLAGS="${CFLAGS} -fno-strict-overflow" |
269 |
- "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests || |
270 |
- die "Tests fail with ${EPYTHON}" |
271 |
-} |
272 |
- |
273 |
-python_install_all() { |
274 |
- local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) |
275 |
- distutils-r1_python_install_all |
276 |
- |
277 |
- if use emacs; then |
278 |
- elisp-install ${PN} Tools/cython-mode.* |
279 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
280 |
- fi |
281 |
-} |
282 |
- |
283 |
-pkg_postinst() { |
284 |
- use emacs && elisp-site-regen |
285 |
-} |
286 |
- |
287 |
-pkg_postrm() { |
288 |
- use emacs && elisp-site-regen |
289 |
-} |
290 |
|
291 |
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 |
292 |
deleted file mode 100644 |
293 |
index 3f426754f6f1..000000000000 |
294 |
--- a/dev-python/cython/files/cython-0.29.14-sphinx-update.patch |
295 |
+++ /dev/null |
296 |
@@ -1,13 +0,0 @@ |
297 |
-diff --git a/docs/conf.py b/docs/conf.py |
298 |
-index 10662e28c..a84e0b928 100644 |
299 |
---- a/docs/conf.py |
300 |
-+++ b/docs/conf.py |
301 |
-@@ -41,7 +41,7 @@ highlight_language = 'cython' |
302 |
- extensions = [ |
303 |
- 'ipython_console_highlighting', |
304 |
- 'cython_highlighting', |
305 |
-- 'sphinx.ext.pngmath', |
306 |
-+ 'sphinx.ext.imgmath', |
307 |
- 'sphinx.ext.todo', |
308 |
- 'sphinx.ext.intersphinx', |
309 |
- 'sphinx.ext.autodoc' |
310 |
|
311 |
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 |
312 |
deleted file mode 100644 |
313 |
index 0aa7212b9a34..000000000000 |
314 |
--- a/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch |
315 |
+++ /dev/null |
316 |
@@ -1,29 +0,0 @@ |
317 |
-Needed to prevent a loop while calling cythonize on macOS - or any platform |
318 |
-defaulting to the 'spawn' method, as Python 3.8 does on Darwin. |
319 |
- |
320 |
-https://github.com/cython/cython/pull/3263 |
321 |
-From 15ae78bb74a856836dd64828326f4f0812d36520 Mon Sep 17 00:00:00 2001 |
322 |
-From: Marcel Bargull <marcel.bargull@×××.edu> |
323 |
-Date: Fri, 6 Dec 2019 18:21:19 +0100 |
324 |
-Subject: [PATCH] Disable parallel cythonization for "spawn" start method. |
325 |
- |
326 |
---- |
327 |
- Cython/Build/Dependencies.py | 5 +++++ |
328 |
- 1 file changed, 5 insertions(+) |
329 |
- |
330 |
-diff --git a/Cython/Build/Dependencies.py b/Cython/Build/Dependencies.py |
331 |
-index 593e00a6ef..f9b9c15bc5 100644 |
332 |
---- a/Cython/Build/Dependencies.py |
333 |
-+++ b/Cython/Build/Dependencies.py |
334 |
-@@ -1073,6 +1073,11 @@ def copy_to_build_dir(filepath, root=os.getcwd()): |
335 |
- |
336 |
- if N <= 1: |
337 |
- nthreads = 0 |
338 |
-+ if nthreads: |
339 |
-+ import multiprocessing |
340 |
-+ if multiprocessing.get_start_method() == 'spawn': |
341 |
-+ print('Disabling parallel cythonization for "spawn" process start method.') |
342 |
-+ nthreads = 0 |
343 |
- if nthreads: |
344 |
- import multiprocessing |
345 |
- pool = multiprocessing.Pool( |
346 |
|
347 |
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 |
348 |
deleted file mode 100644 |
349 |
index ff0e45a646dc..000000000000 |
350 |
--- a/dev-python/cython/files/cython-0.29.23-tracing-py310.patch |
351 |
+++ /dev/null |
352 |
@@ -1,213 +0,0 @@ |
353 |
-From c9cccfeaf3f0e20c2bb14fc234e86f4fc8e4fe81 Mon Sep 17 00:00:00 2001 |
354 |
-From: Stefan Behnel <stefan_ml@××××××.de> |
355 |
-Date: Fri, 14 May 2021 19:39:58 +0200 |
356 |
-Subject: [PATCH] Adapt tracing code to Py3.10 beta 1. |
357 |
- |
358 |
---- |
359 |
- Cython/Utility/Profile.c | 79 +++++++++++++++++++++++++--------------- |
360 |
- 1 file changed, 49 insertions(+), 30 deletions(-) |
361 |
- |
362 |
-diff --git a/Cython/Utility/Profile.c b/Cython/Utility/Profile.c |
363 |
-index 15ceb41cc2..2cd9af9da7 100644 |
364 |
---- a/Cython/Utility/Profile.c |
365 |
-+++ b/Cython/Utility/Profile.c |
366 |
-@@ -47,13 +47,32 @@ |
367 |
- #define CYTHON_FRAME_DEL(frame) Py_CLEAR(frame) |
368 |
- #endif |
369 |
- |
370 |
-- #define __Pyx_TraceDeclarations \ |
371 |
-- static PyCodeObject *$frame_code_cname = NULL; \ |
372 |
-- CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL; \ |
373 |
-- int __Pyx_use_tracing = 0; |
374 |
-+ #define __Pyx_TraceDeclarations \ |
375 |
-+ static PyCodeObject *$frame_code_cname = NULL; \ |
376 |
-+ CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL; \ |
377 |
-+ int __Pyx_use_tracing = 0; |
378 |
- |
379 |
-- #define __Pyx_TraceFrameInit(codeobj) \ |
380 |
-- if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj; |
381 |
-+ #define __Pyx_TraceFrameInit(codeobj) \ |
382 |
-+ if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj; |
383 |
-+ |
384 |
-+#if PY_VERSION_HEX >= 0x030a00b1 |
385 |
-+ #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \ |
386 |
-+ (unlikely(tstate->cframe->use_tracing) && \ |
387 |
-+ (!(check_tracing) || !tstate->tracing) && \ |
388 |
-+ (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) |
389 |
-+ |
390 |
-+ #define __Pyx_SetTracing(tstate, enable) \ |
391 |
-+ (tstate)->cframe->use_tracing = (enable) |
392 |
-+ |
393 |
-+#else |
394 |
-+ #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \ |
395 |
-+ (unlikely(tstate->use_tracing) && \ |
396 |
-+ (!(check_tracing) || !tstate->tracing) && \ |
397 |
-+ (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) |
398 |
-+ |
399 |
-+ #define __Pyx_SetTracing(tstate, enable) \ |
400 |
-+ (tstate)->use_tracing = (enable) |
401 |
-+#endif |
402 |
- |
403 |
- #ifdef WITH_THREAD |
404 |
- #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error) \ |
405 |
-@@ -62,8 +81,7 @@ |
406 |
- PyThreadState *tstate; \ |
407 |
- PyGILState_STATE state = PyGILState_Ensure(); \ |
408 |
- tstate = __Pyx_PyThreadState_Current; \ |
409 |
-- if (unlikely(tstate->use_tracing) && !tstate->tracing && \ |
410 |
-- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ |
411 |
-+ if (__Pyx_IsTracing(tstate, 1, 1)) { \ |
412 |
- __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno); \ |
413 |
- } \ |
414 |
- PyGILState_Release(state); \ |
415 |
-@@ -71,8 +89,7 @@ |
416 |
- } \ |
417 |
- } else { \ |
418 |
- PyThreadState* tstate = PyThreadState_GET(); \ |
419 |
-- if (unlikely(tstate->use_tracing) && !tstate->tracing && \ |
420 |
-- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ |
421 |
-+ if (__Pyx_IsTracing(tstate, 1, 1)) { \ |
422 |
- __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno); \ |
423 |
- if (unlikely(__Pyx_use_tracing < 0)) goto_error; \ |
424 |
- } \ |
425 |
-@@ -80,8 +97,7 @@ |
426 |
- #else |
427 |
- #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error) \ |
428 |
- { PyThreadState* tstate = PyThreadState_GET(); \ |
429 |
-- if (unlikely(tstate->use_tracing) && !tstate->tracing && \ |
430 |
-- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ |
431 |
-+ if (__Pyx_IsTracing(tstate, 1, 1)) { \ |
432 |
- __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno); \ |
433 |
- if (unlikely(__Pyx_use_tracing < 0)) goto_error; \ |
434 |
- } \ |
435 |
-@@ -91,10 +107,9 @@ |
436 |
- #define __Pyx_TraceException() \ |
437 |
- if (likely(!__Pyx_use_tracing)); else { \ |
438 |
- PyThreadState* tstate = __Pyx_PyThreadState_Current; \ |
439 |
-- if (tstate->use_tracing && \ |
440 |
-- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ |
441 |
-+ if (__Pyx_IsTracing(tstate, 0, 1)) { \ |
442 |
- tstate->tracing++; \ |
443 |
-- tstate->use_tracing = 0; \ |
444 |
-+ __Pyx_SetTracing(tstate, 0); \ |
445 |
- PyObject *exc_info = __Pyx_GetExceptionTuple(tstate); \ |
446 |
- if (exc_info) { \ |
447 |
- if (CYTHON_TRACE && tstate->c_tracefunc) \ |
448 |
-@@ -104,7 +119,7 @@ |
449 |
- tstate->c_profileobj, $frame_cname, PyTrace_EXCEPTION, exc_info); \ |
450 |
- Py_DECREF(exc_info); \ |
451 |
- } \ |
452 |
-- tstate->use_tracing = 1; \ |
453 |
-+ __Pyx_SetTracing(tstate, 1); \ |
454 |
- tstate->tracing--; \ |
455 |
- } \ |
456 |
- } |
457 |
-@@ -113,13 +128,13 @@ |
458 |
- PyObject *type, *value, *traceback; |
459 |
- __Pyx_ErrFetchInState(tstate, &type, &value, &traceback); |
460 |
- tstate->tracing++; |
461 |
-- tstate->use_tracing = 0; |
462 |
-+ __Pyx_SetTracing(tstate, 0); |
463 |
- if (CYTHON_TRACE && tstate->c_tracefunc) |
464 |
- tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_RETURN, result); |
465 |
- if (tstate->c_profilefunc) |
466 |
- tstate->c_profilefunc(tstate->c_profileobj, frame, PyTrace_RETURN, result); |
467 |
- CYTHON_FRAME_DEL(frame); |
468 |
-- tstate->use_tracing = 1; |
469 |
-+ __Pyx_SetTracing(tstate, 1); |
470 |
- tstate->tracing--; |
471 |
- __Pyx_ErrRestoreInState(tstate, type, value, traceback); |
472 |
- } |
473 |
-@@ -132,14 +147,14 @@ |
474 |
- PyThreadState *tstate; \ |
475 |
- PyGILState_STATE state = PyGILState_Ensure(); \ |
476 |
- tstate = __Pyx_PyThreadState_Current; \ |
477 |
-- if (tstate->use_tracing) { \ |
478 |
-+ if (__Pyx_IsTracing(tstate, 0, 0)) { \ |
479 |
- __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result); \ |
480 |
- } \ |
481 |
- PyGILState_Release(state); \ |
482 |
- } \ |
483 |
- } else { \ |
484 |
- PyThreadState* tstate = __Pyx_PyThreadState_Current; \ |
485 |
-- if (tstate->use_tracing) { \ |
486 |
-+ if (__Pyx_IsTracing(tstate, 0, 0)) { \ |
487 |
- __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result); \ |
488 |
- } \ |
489 |
- } \ |
490 |
-@@ -148,7 +163,7 @@ |
491 |
- #define __Pyx_TraceReturn(result, nogil) \ |
492 |
- if (likely(!__Pyx_use_tracing)); else { \ |
493 |
- PyThreadState* tstate = __Pyx_PyThreadState_Current; \ |
494 |
-- if (tstate->use_tracing) { \ |
495 |
-+ if (__Pyx_IsTracing(tstate, 0, 0)) { \ |
496 |
- __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result); \ |
497 |
- } \ |
498 |
- } |
499 |
-@@ -176,9 +191,11 @@ |
500 |
- __Pyx_ErrFetchInState(tstate, &type, &value, &traceback); |
501 |
- __Pyx_PyFrame_SetLineNumber(frame, lineno); |
502 |
- tstate->tracing++; |
503 |
-- tstate->use_tracing = 0; |
504 |
-+ __Pyx_SetTracing(tstate, 0); |
505 |
-+ |
506 |
- ret = tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_LINE, NULL); |
507 |
-- tstate->use_tracing = 1; |
508 |
-+ |
509 |
-+ __Pyx_SetTracing(tstate, 1); |
510 |
- tstate->tracing--; |
511 |
- if (likely(!ret)) { |
512 |
- __Pyx_ErrRestoreInState(tstate, type, value, traceback); |
513 |
-@@ -199,7 +216,7 @@ |
514 |
- PyThreadState *tstate; \ |
515 |
- PyGILState_STATE state = __Pyx_PyGILState_Ensure(); \ |
516 |
- tstate = __Pyx_PyThreadState_Current; \ |
517 |
-- if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \ |
518 |
-+ if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \ |
519 |
- ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno); \ |
520 |
- } \ |
521 |
- __Pyx_PyGILState_Release(state); \ |
522 |
-@@ -207,7 +224,7 @@ |
523 |
- } \ |
524 |
- } else { \ |
525 |
- PyThreadState* tstate = __Pyx_PyThreadState_Current; \ |
526 |
-- if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \ |
527 |
-+ if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \ |
528 |
- int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno); \ |
529 |
- if (unlikely(ret)) goto_error; \ |
530 |
- } \ |
531 |
-@@ -217,7 +234,7 @@ |
532 |
- #define __Pyx_TraceLine(lineno, nogil, goto_error) \ |
533 |
- if (likely(!__Pyx_use_tracing)); else { \ |
534 |
- PyThreadState* tstate = __Pyx_PyThreadState_Current; \ |
535 |
-- if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \ |
536 |
-+ if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \ |
537 |
- int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno); \ |
538 |
- if (unlikely(ret)) goto_error; \ |
539 |
- } \ |
540 |
-@@ -263,19 +280,21 @@ static int __Pyx_TraceSetupAndCall(PyCodeObject** code, |
541 |
- (*frame)->f_tstate = tstate; |
542 |
- #endif |
543 |
- } |
544 |
-- __Pyx_PyFrame_SetLineNumber(*frame, firstlineno); |
545 |
-+ __Pyx_PyFrame_SetLineNumber(*frame, firstlineno); |
546 |
-+ |
547 |
- retval = 1; |
548 |
- tstate->tracing++; |
549 |
-- tstate->use_tracing = 0; |
550 |
-+ __Pyx_SetTracing(tstate, 0); |
551 |
- __Pyx_ErrFetchInState(tstate, &type, &value, &traceback); |
552 |
-+ |
553 |
- #if CYTHON_TRACE |
554 |
- if (tstate->c_tracefunc) |
555 |
- retval = tstate->c_tracefunc(tstate->c_traceobj, *frame, PyTrace_CALL, NULL) == 0; |
556 |
- if (retval && tstate->c_profilefunc) |
557 |
- #endif |
558 |
- retval = tstate->c_profilefunc(tstate->c_profileobj, *frame, PyTrace_CALL, NULL) == 0; |
559 |
-- tstate->use_tracing = (tstate->c_profilefunc || |
560 |
-- (CYTHON_TRACE && tstate->c_tracefunc)); |
561 |
-+ |
562 |
-+ __Pyx_SetTracing(tstate, (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))); |
563 |
- tstate->tracing--; |
564 |
- if (retval) { |
565 |
- __Pyx_ErrRestoreInState(tstate, type, value, traceback); |
566 |
|
567 |
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 |
568 |
deleted file mode 100644 |
569 |
index 64202a93ecad..000000000000 |
570 |
--- a/dev-python/cython/files/cython-0.29.24-test-failure-warning.patch |
571 |
+++ /dev/null |
572 |
@@ -1,20 +0,0 @@ |
573 |
-https://github.com/cython/cython/commit/bf4979e2441ffbc9aaeb88f5c67608578040588f |
574 |
-https://bugs.gentoo.org/739516 |
575 |
- |
576 |
-From: Stefan Behnel <stefan_ml@××××××.de> |
577 |
-Date: Sat, 3 Apr 2021 08:23:44 +0200 |
578 |
-Subject: [PATCH] Make a helper function in a C++ test correctly propagate |
579 |
- exceptions so that it won't have to spit out compiler warnings. |
580 |
- |
581 |
---- a/tests/run/cpp_stl_conversion.pyx |
582 |
-+++ b/tests/run/cpp_stl_conversion.pyx |
583 |
-@@ -15,7 +15,7 @@ py_set = set |
584 |
- py_xrange = xrange |
585 |
- py_unicode = unicode |
586 |
- |
587 |
--cdef string add_strings(string a, string b): |
588 |
-+cdef string add_strings(string a, string b) except *: |
589 |
- return a + b |
590 |
- |
591 |
- def normalize(bytes b): |
592 |
- |
593 |
|
594 |
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 |
595 |
deleted file mode 100644 |
596 |
index 955c32debb49..000000000000 |
597 |
--- a/dev-python/cython/files/cython-0.29.24-unaligned-format.patch |
598 |
+++ /dev/null |
599 |
@@ -1,33 +0,0 @@ |
600 |
-From 2c08fd50d62e4255602ee3c0d41157df7608e773 Mon Sep 17 00:00:00 2001 |
601 |
-From: Stefan Behnel <stefan_ml@××××××.de> |
602 |
-Date: Wed, 1 Sep 2021 00:09:02 +0200 |
603 |
-Subject: [PATCH] Avoid copying unaligned 16-bit values since some platforms |
604 |
- require them to be aligned. Use memcpy() instead to let the C compiler decide |
605 |
- how to do it. |
606 |
- |
607 |
-Closes https://github.com/cython/cython/issues/4343 |
608 |
---- |
609 |
- Cython/Utility/TypeConversion.c | 6 +++--- |
610 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
611 |
- |
612 |
-diff --git a/Cython/Utility/TypeConversion.c b/Cython/Utility/TypeConversion.c |
613 |
-index 751d12b62a..3669bc9ec1 100644 |
614 |
---- a/Cython/Utility/TypeConversion.c |
615 |
-+++ b/Cython/Utility/TypeConversion.c |
616 |
-@@ -829,14 +829,14 @@ static CYTHON_INLINE PyObject* {{TO_PY_FUNCTION}}({{TYPE}} value, Py_ssize_t wid |
617 |
- digit_pos = abs((int)(remaining % (8*8))); |
618 |
- remaining = ({{TYPE}}) (remaining / (8*8)); |
619 |
- dpos -= 2; |
620 |
-- *(uint16_t*)dpos = ((const uint16_t*)DIGIT_PAIRS_8)[digit_pos]; /* copy 2 digits at a time */ |
621 |
-+ memcpy(dpos, DIGIT_PAIRS_8 + digit_pos * 2, 2); /* copy 2 digits at a time, unaligned */ |
622 |
- last_one_off = (digit_pos < 8); |
623 |
- break; |
624 |
- case 'd': |
625 |
- digit_pos = abs((int)(remaining % (10*10))); |
626 |
- remaining = ({{TYPE}}) (remaining / (10*10)); |
627 |
- dpos -= 2; |
628 |
-- *(uint16_t*)dpos = ((const uint16_t*)DIGIT_PAIRS_10)[digit_pos]; /* copy 2 digits at a time */ |
629 |
-+ memcpy(dpos, DIGIT_PAIRS_10 + digit_pos * 2, 2); /* copy 2 digits at a time, unaligned */ |
630 |
- last_one_off = (digit_pos < 10); |
631 |
- break; |
632 |
- case 'x': |