commit: 532eb547a397c2aee97fc53dc593f5f4071ed799 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jun 15 09:39:43 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Jun 15 09:39:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532eb547
dev-python/sympy: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/sympy/Manifest | 2 - dev-python/sympy/files/sympy-1.12-c99.patch | 48 ----------- dev-python/sympy/files/sympy-1.12-py312.patch | 42 ---------- dev-python/sympy/sympy-1.12-r1.ebuild | 116 -------------------------- dev-python/sympy/sympy-1.12.1_rc1.ebuild | 104 ----------------------- 5 files changed, 312 deletions(-) diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest index c480f49b59e0..812698472118 100644 --- a/dev-python/sympy/Manifest +++ b/dev-python/sympy/Manifest @@ -1,3 +1 @@ DIST sympy-1.12.1.gh.tar.gz 8025309 BLAKE2B 01fe3e95716b0efcf682613fb8ba6f149f4f4dc4ad3f20eb816d85f30042af1cd5860d3d157d4c26458520cc2f8e994ae6671058a7a0d5237e7f15d0e61f9e53 SHA512 9b50d2b0e8e9628c38296f8d1e25c83b1b9fa1503166b48cc344709217393b00910ad3441a1da0e81e6faf56e5db7a33bc96926918da024cafc77fb4957f94a4 -DIST sympy-1.12.1rc1.gh.tar.gz 8009898 BLAKE2B 7afbcb0c17249509a1a780bdfbe72eee5aaa4b4548a587968bd2c454cbdbda9e81b47ee31c98a8aa2323d575a9cc8897f9b52aba0eec1ed831e3038b2fc15aff SHA512 575947bc1057d8bfb5e4d6f84243d0206449ef97d861e6029c11f0868c34b8d909159901054469738577edc8f941db14a61936402037a24153c1ca97af4758ad -DIST sympy-1.12.gh.tar.gz 7212937 BLAKE2B 1d37a019e7a6700e69e16d6ca7fdc563711165fc226ac6ec745d20fa6dc689ee9ea01a92549d851aacff763230872c2d1d0cb5bde581c4f960f5de515ffb5f06 SHA512 96a89b88f6912d70c56f5bd1903dd3c518963118ff25d033cdcb7da2f260b8ee209d3ab4a4394dd2b5dc0b4585b71ccd55d55c8e5c6e28024cccbedf07ee4360 diff --git a/dev-python/sympy/files/sympy-1.12-c99.patch b/dev-python/sympy/files/sympy-1.12-c99.patch deleted file mode 100644 index 311311cfcea3..000000000000 --- a/dev-python/sympy/files/sympy-1.12-c99.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://github.com/sympy/sympy/pull/25968 - -From 2251ba15d33656fce53668d789c390923eeae919 Mon Sep 17 00:00:00 2001 -From: Jerry James <loganje...@gmail.com> -Date: Fri, 8 Dec 2023 15:12:26 -0700 -Subject: [PATCH] Avoid incompatible pointer type error with GCC 14 - ---- a/sympy/utilities/autowrap.py -+++ b/sympy/utilities/autowrap.py -@@ -714,7 +714,11 @@ def binary_function(symfunc, expr, **kwargs): - _ufunc_outcalls = Template("*((double *)out${outnum}) = ${funcname}(${call_args});") - - _ufunc_body = Template("""\ -+#ifdef NPY_1_19_API_VERSION -+static void ${funcname}_ufunc(char **args, const npy_intp *dimensions, const npy_intp* steps, void* data) -+#else - static void ${funcname}_ufunc(char **args, npy_intp *dimensions, npy_intp* steps, void* data) -+#endif - { - npy_intp i; - npy_intp n = dimensions[0]; ---- a/sympy/utilities/tests/test_autowrap.py -+++ b/sympy/utilities/tests/test_autowrap.py -@@ -284,7 +284,11 @@ def test_ufuncify_source(): - {NULL, NULL, 0, NULL} - }; - -+#ifdef NPY_1_19_API_VERSION -+static void test_ufunc(char **args, const npy_intp *dimensions, const npy_intp* steps, void* data) -+#else - static void test_ufunc(char **args, npy_intp *dimensions, npy_intp* steps, void* data) -+#endif - { - npy_intp i; - npy_intp n = dimensions[0]; -@@ -378,7 +382,11 @@ def test_ufuncify_source_multioutput(): - {NULL, NULL, 0, NULL} - }; - -+#ifdef NPY_1_19_API_VERSION -+static void multitest_ufunc(char **args, const npy_intp *dimensions, const npy_intp* steps, void* data) -+#else - static void multitest_ufunc(char **args, npy_intp *dimensions, npy_intp* steps, void* data) -+#endif - { - npy_intp i; - npy_intp n = dimensions[0]; - diff --git a/dev-python/sympy/files/sympy-1.12-py312.patch b/dev-python/sympy/files/sympy-1.12-py312.patch deleted file mode 100644 index 13501c3fb34d..000000000000 --- a/dev-python/sympy/files/sympy-1.12-py312.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8a2c3c4de266f49312eda4c91dcdf5d5464717e8 Mon Sep 17 00:00:00 2001 -From: Pablo Galindo <pablog...@gmail.com> -Date: Fri, 9 Jun 2023 11:22:20 +0100 -Subject: [PATCH] Fix factorial parsing for Python 3.12 - -Signed-off-by: Pablo Galindo <pablog...@gmail.com> ---- - .mailmap | 1 + - sympy/parsing/sympy_parser.py | 5 ++++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/.mailmap b/.mailmap -index fe496637dd..8a9de2d99d 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -1496,6 +1496,7 @@ naelsondouglas <naelso...@gmail.com> - noam simcha finkelstein <noam.finkelst...@protonmail.com> - numbermaniac <5206120+numberman...@users.noreply.github.com> - oittaa <8972248+oit...@users.noreply.github.com> -+pablogsal <pablog...@gmail.com> - pekochun <hamburg_hamburger2...@yahoo.co.jp> - prshnt19 <prashant.rawat...@gmail.com> - rahuldan <rahul02...@gmail.com> -diff --git a/sympy/parsing/sympy_parser.py b/sympy/parsing/sympy_parser.py -index 5935f4baf2..862679e644 100644 ---- a/sympy/parsing/sympy_parser.py -+++ b/sympy/parsing/sympy_parser.py -@@ -627,7 +627,10 @@ def factorial_notation(tokens: List[TOKEN], local_dict: DICT, global_dict: DICT) - result: List[TOKEN] = [] - nfactorial = 0 - for toknum, tokval in tokens: -- if toknum == ERRORTOKEN: -+ if toknum == OP and tokval == "!": -+ # In Python 3.12 "!" are OP instead of ERRORTOKEN -+ nfactorial += 1 -+ elif toknum == ERRORTOKEN: - op = tokval - if op == '!': - nfactorial += 1 --- -2.42.1 - diff --git a/dev-python/sympy/sympy-1.12-r1.ebuild b/dev-python/sympy/sympy-1.12-r1.ebuild deleted file mode 100644 index 875f50d21831..000000000000 --- a/dev-python/sympy/sympy-1.12-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -inherit distutils-r1 virtualx - -DESCRIPTION="Computer Algebra System in pure Python" -HOMEPAGE=" - https://www.sympy.org/ - https://github.com/sympy/sympy/ - https://pypi.org/project/sympy/ -" -SRC_URI=" - https://github.com/sympy/sympy/archive/${P}.tar.gz -> ${P}.gh.tar.gz -" -S="${WORKDIR}/${PN}-${P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="aesara examples imaging ipython latex mathml opengl pdf png pyglet symengine texmacs" - -RDEPEND=" - dev-python/mpmath[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - aesara? ( - $(python_gen_cond_dep ' - dev-python/aesara[${PYTHON_USEDEP}] - ' python3_{10..11}) - ) - imaging? ( dev-python/pillow[${PYTHON_USEDEP}] ) - ipython? ( dev-python/ipython[${PYTHON_USEDEP}] ) - latex? ( - virtual/latex-base - dev-texlive/texlive-fontsextra - png? ( app-text/dvipng ) - pdf? ( app-text/ghostscript-gpl ) - ) - mathml? ( dev-python/lxml[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) - pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] ) - symengine? ( dev-python/symengine[${PYTHON_USEDEP}] ) - texmacs? ( app-office/texmacs ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}/${P}-py312.patch" - "${FILESDIR}/${PN}-1.12-c99.patch" -) - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # require old version of antlr4 - sympy/parsing/tests/test_autolev.py - sympy/parsing/tests/test_latex.py - # crash due to assertions in sys-devel/llvm[debug] - sympy/parsing/tests/test_c_parser.py - - # TODO: pytest? - sympy/solvers/ode/tests/test_systems.py::test_linear_3eq_order1_type4_long_check - sympy/solvers/ode/tests/test_systems.py::test_linear_3eq_order1_type4_long_dsolve_dotprodsimp - - # either very slow or hanging - sympy/solvers/ode/tests/test_systems.py::test_linear_new_order1_type2_de_lorentz_slow_check - sympy/integrals/tests/test_failing_integrals.py::test_issue_15227 - sympy/matrices/tests/test_matrices.py::test_pinv_rank_deficient_when_diagonalization_fails - sympy/solvers/ode/tests/test_systems.py::test_nonlinear_3eq_order1_type1 - sympy/solvers/ode/tests/test_systems.py::test_nonlinear_3eq_order1_type3 - ) - - case ${EPYTHON} in - pypy3) - if has_version "<dev-python/pypy3_10-exe-7.3.13_p2" || - has_version "<dev-python/pypy3_10-exe-bin-7.3.13_p2" - then - EPYTEST_DESELECT+=( - # https://foss.heptapod.net/pypy/pypy/-/issues/4032 - sympy/tensor/array/tests/test_array_comprehension.py::test_arraycomprehensionmap - ) - fi - ;; - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - nonfatal epytest --veryquickcheck || - die -n "Tests failed with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( AUTHORS README.md ) - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - distutils-r1_python_install_all - - if use texmacs; then - exeinto /usr/libexec/TeXmacs/bin/ - doexe data/TeXmacs/bin/tm_sympy - insinto /usr/share/TeXmacs/plugins/sympy/ - doins -r data/TeXmacs/progs - fi -} diff --git a/dev-python/sympy/sympy-1.12.1_rc1.ebuild b/dev-python/sympy/sympy-1.12.1_rc1.ebuild deleted file mode 100644 index b5b261a645c7..000000000000 --- a/dev-python/sympy/sympy-1.12.1_rc1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -inherit distutils-r1 virtualx - -DESCRIPTION="Computer Algebra System in pure Python" -HOMEPAGE=" - https://www.sympy.org/ - https://github.com/sympy/sympy/ - https://pypi.org/project/sympy/ -" -# pypi sdist misses some files, notably top-level conftest.py, as of 1.12.1_rc1 -SRC_URI=" - https://github.com/sympy/sympy/archive/${PV/_/}.tar.gz - -> ${P/_/}.gh.tar.gz -" -S=${WORKDIR}/${P/_/} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="aesara examples imaging ipython latex mathml opengl pdf png pyglet symengine texmacs" - -RDEPEND=" - dev-python/mpmath[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - aesara? ( - $(python_gen_cond_dep ' - dev-python/aesara[${PYTHON_USEDEP}] - ' python3_{10..11}) - ) - imaging? ( dev-python/pillow[${PYTHON_USEDEP}] ) - ipython? ( dev-python/ipython[${PYTHON_USEDEP}] ) - latex? ( - virtual/latex-base - dev-texlive/texlive-fontsextra - png? ( app-text/dvipng ) - pdf? ( app-text/ghostscript-gpl ) - ) - mathml? ( dev-python/lxml[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) - pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] ) - symengine? ( dev-python/symengine[${PYTHON_USEDEP}] ) - texmacs? ( app-office/texmacs ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # require old version of antlr4 - sympy/parsing/tests/test_autolev.py - sympy/parsing/tests/test_latex.py - # crash due to assertions in sys-devel/llvm[debug] - sympy/parsing/tests/test_c_parser.py - - # TODO: pytest? - sympy/solvers/ode/tests/test_systems.py::test_linear_3eq_order1_type4_long_check - sympy/solvers/ode/tests/test_systems.py::test_linear_3eq_order1_type4_long_dsolve_dotprodsimp - - # either very slow or hanging - sympy/solvers/ode/tests/test_systems.py::test_linear_new_order1_type2_de_lorentz_slow_check - sympy/integrals/tests/test_failing_integrals.py::test_issue_15227 - sympy/matrices/tests/test_matrices.py::test_pinv_rank_deficient_when_diagonalization_fails - sympy/solvers/ode/tests/test_systems.py::test_nonlinear_3eq_order1_type1 - sympy/solvers/ode/tests/test_systems.py::test_nonlinear_3eq_order1_type3 - - # known broken - # https://github.com/sympy/sympy/issues/26321 - sympy/solvers/tests/test_simplex.py::test_lp - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - nonfatal epytest --veryquickcheck || - die -n "Tests failed with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( AUTHORS README.md ) - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - distutils-r1_python_install_all - - if use texmacs; then - exeinto /usr/libexec/TeXmacs/bin/ - doexe data/TeXmacs/bin/tm_sympy - insinto /usr/share/TeXmacs/plugins/sympy/ - doins -r data/TeXmacs/progs - fi -}
