From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 865AE1581C1 for ; Sat, 13 Jul 2024 19:25:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 898AEE2B59; Sat, 13 Jul 2024 19:25:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55610E2B59 for ; Sat, 13 Jul 2024 19:25:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3778F33BE32 for ; Sat, 13 Jul 2024 19:25:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C89BD1E21 for ; Sat, 13 Jul 2024 19:25:34 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1720898727.1981769ec1ed73c7789430d9ce75072ec5daab12.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/files/, dev-python/scipy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/scipy/Manifest dev-python/scipy/files/scipy-1.13.1-test.patch dev-python/scipy/scipy-1.11.3-r2.ebuild dev-python/scipy/scipy-1.11.4-r1.ebuild dev-python/scipy/scipy-1.12.0-r1.ebuild dev-python/scipy/scipy-1.13.0.ebuild dev-python/scipy/scipy-1.13.1.ebuild X-VCS-Directories: dev-python/scipy/ dev-python/scipy/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1981769ec1ed73c7789430d9ce75072ec5daab12 X-VCS-Branch: master Date: Sat, 13 Jul 2024 19:25:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a1bea8c2-a810-4bd9-a3ee-7297dc51531c X-Archives-Hash: 10ce6ba406439f5a9f4a82fe9a4af837 commit: 1981769ec1ed73c7789430d9ce75072ec5daab12 Author: Michał Górny gentoo org> AuthorDate: Sat Jul 13 19:15:42 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jul 13 19:25:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1981769e dev-python/scipy: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/scipy/Manifest | 9 -- dev-python/scipy/files/scipy-1.13.1-test.patch | 46 ------- dev-python/scipy/scipy-1.11.3-r2.ebuild | 150 ---------------------- dev-python/scipy/scipy-1.11.4-r1.ebuild | 150 ---------------------- dev-python/scipy/scipy-1.12.0-r1.ebuild | 151 ---------------------- dev-python/scipy/scipy-1.13.0.ebuild | 166 ------------------------ dev-python/scipy/scipy-1.13.1.ebuild | 171 ------------------------- 7 files changed, 843 deletions(-) diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest index d0f7b049753a..1e6b60d8065c 100644 --- a/dev-python/scipy/Manifest +++ b/dev-python/scipy/Manifest @@ -1,11 +1,2 @@ -DIST scipy-1.11.3.tar.gz 56335652 BLAKE2B 2b35c24522b2bd498b4ebe84a854c8ec1e62917e7b899b3e3526abb9780c1e56f8e776a3bb1eab1bedb17a273fac881e5ffdaac808084a4f5a5f97428bff1029 SHA512 6491c4e479d9f4f02e677396a25ddca947a0dc6c009fc2ec34c658012a6224c0b535f14045bb011fbde9973ea987d184574ed64e6760c31798ec860eb0896fcf -DIST scipy-1.11.4.tar.gz 56336202 BLAKE2B a2091a1edb54eb73c2de6ed8c62a7e571f37b247c9af50947aa97b739342c96b87b20a82b1a238c859fa532c84249cbadde228366dcea3555e9a506c1ae55031 SHA512 2eb403f6de9723b411d948b8e1b5457078704c605b8e760d42362c82d802e167eaaf701ddb8b480af2bdf2efe4dbf66fcc4e97321519bb8dab19b0e2a8976beb -DIST scipy-1.12.0.tar.gz 56811768 BLAKE2B 03c142274f1466747935fa54fab427f3a48c1642406211fa1a0f8ad5e0f194baecf76182e0448a0fb647063871483239cd876ce431cd9406e396e6170912ab64 SHA512 376ed94c4caaf782814bb07047fff0b363f7b608a0399697c6e862432333cbe6d3abb351730a574a3f077b3cdd9cb7474090a460baffcfbd5546bcfee309b6e7 -DIST scipy-1.13.0.tar.gz 57204550 BLAKE2B cfbb4e76efae952854e9ff4ed254e9819b58d224906e1ded3c6a914b1e28b5fad15f8bbbb4a9c413969d6e4b1faf4e0038a36729171ff06e640b241a9dd4af94 SHA512 9bd6fd3f76742a07e5bb003edf4c0e3a82edf749077502fbce3d16fe595d455846edcf57db12ec0a9d4792803e974355362d919047414badfcaededf1e4343f7 -DIST scipy-1.13.1.tar.gz 57210720 BLAKE2B d58d673de9b8d6239a3de285982d65ba1baf0ca8b623276c19b85b1f4bb83c56e66c32d7a22d1d602435cfa086b5d56167cac55bdda608590aaddf677844f060 SHA512 28aafdbcae7229a3d11f192683b703cb485d45e4d90413d6564df3d9005bc8fd4df8bd92caffe657666828cd7253e7e0363c0948c74a1b8f3f3b7d4f4cfd9b36 DIST scipy-1.14.0.tar.gz 58618870 BLAKE2B bf9ed05628b02dc058555402995caae722cf6802bde80387d4e4477ec533589a66ca70b5dd44a32ddac652c7c69300406434b80e7cbc9aee2a78ae6b26ee4c2b SHA512 6579d988a2093602f5fc82203bbb5dc5690a95032484b5d5bd843d1e7995b3b89d802c7b38ec0345c1f3d8e22c98fb92b3982a1eadfcdf63607f929a52b56abf -DIST scipy-html-1.11.0.zip 50421508 BLAKE2B cb5e4a4f8817a80f54ae73b4a47ba22d2438df46ebfe27ef5fdc2695fdd983226f4ccae925bf82b15d01ced4f4b6807384ecadac5e1aa7700aa887ad06b7d065 SHA512 33718bbd5e828687d93fccc441a53b6a2e8f54ac4952d3b69d4c4668f55cb6ef5aba33df9acda20b2400effa5ae71767b2a5602a365ad2045a6edd24ff89c253 -DIST scipy-html-1.11.2.zip 50435722 BLAKE2B 460c67509a8bf50986f866ee2f90e634af21ddd71508efeef5681c2ee2130c3f79b4b428bc21277bfb310bb45ccad1fb38221ada43620055377cdc4839b9d1e5 SHA512 986a6e37f9e01dc4925ef22af6ff660bae1e4b66e57270262974c207dfb70285e3f8f548774d6e81d5f457b9198c0ba1c06e6d689fe5d54fdea878c1e5a7f797 -DIST scipy-html-1.13.0.zip 65327245 BLAKE2B 5e5ffbf4ff4a28c5a003da0e5170ef5eef1b430ecca0284a89aed5f96f7afc549db001beb2e56b3debbd3527c57b773b25c35579b32d8a6d8e5e97a75db4d38b SHA512 792c32f077d76d47e42d02c5047990a6afdcdc9c31dcc7e9987e7a5aa62c56aec44dcf7d14e3f94ae59f8fb718ce89a2835b87d2aef7a16ce9a534361b7329d7 -DIST scipy-html-1.13.1.zip 65288062 BLAKE2B 4eea1277870fcc0070d543139ef8b786d3c6841835601eb5447fed042d03035edfb556f824ccbf9946f1efa41da75372df1dd3789d045bdbaea7e156010bb8e6 SHA512 fc70eb7fa3763e40f2389ad31e1a78fcd2aa1b3db40927f57a583692143001c8b6a8f3f0ddea47eaf62adb30d1207765d8887a2a53baa1b8ed706b7fb348bbbf DIST scipy-html-1.14.0.zip 65723829 BLAKE2B ba47dbf00a5d2a53a9addc5ea68ab18b42f211a018b89aa4b0b57ff0dee02e410a3effc59ddf8fbbc5aa33075d45d86880aed3a14068da5bd7b62ee526199967 SHA512 93be0bafcc64cea1ba130bbcc77c0741acc4f819c84a5030391a22657a1bc63abe8434a2723f66b7ad04c0809dc6d02e3a97ffb8d94bd3d4a4bb759ee796b475 diff --git a/dev-python/scipy/files/scipy-1.13.1-test.patch b/dev-python/scipy/files/scipy-1.13.1-test.patch deleted file mode 100644 index e10e8551b757..000000000000 --- a/dev-python/scipy/files/scipy-1.13.1-test.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2f930ed7d579837423cf58f30d25d4922e4cef7c Mon Sep 17 00:00:00 2001 -From: Evgeni Burovski -Date: Thu, 6 Jun 2024 10:01:58 +0300 -Subject: [PATCH] TST: linalg: bump tolerance in TestEig::test_singular - -Some assertions have atol/rtol configurable, and one assertion had them -hardcoded, and that was causing tolerance problems in a Debian build with -reference LAPACK. - -closes https://github.com/scipy/scipy/issues/20911 ---- - scipy/linalg/tests/test_decomp.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/scipy/linalg/tests/test_decomp.py b/scipy/linalg/tests/test_decomp.py -index 5e171965a4bd..2c4033360d16 100644 ---- a/scipy/linalg/tests/test_decomp.py -+++ b/scipy/linalg/tests/test_decomp.py -@@ -181,7 +181,8 @@ def test_gh_3054(self): - assert_equal(w, np.inf) - assert_allclose(vr, 1) - -- def _check_gen_eig(self, A, B, atol_homog=1e-13, rtol_homog=1e-13): -+ def _check_gen_eig(self, A, B, atol_homog=1e-13, rtol_homog=1e-13, -+ atol=1e-13, rtol=1e-13): - if B is not None: - A, B = asarray(A), asarray(B) - B0 = B -@@ -230,7 +231,7 @@ def _check_gen_eig(self, A, B, atol_homog=1e-13, rtol_homog=1e-13): - for i in range(res.shape[1]): - if np.all(isfinite(res[:, i])): - assert_allclose(res[:, i], 0, -- rtol=1e-13, atol=1e-13, err_msg=msg) -+ rtol=rtol, atol=atol, err_msg=msg) - - # try to consistently order eigenvalues, including complex conjugate pairs - w_fin = w[isfinite(w)] -@@ -269,7 +270,7 @@ def test_singular(self): - [24, 35, 18, 21, 22]]) - - with np.errstate(all='ignore'): -- self._check_gen_eig(A, B, atol_homog=5e-13) -+ self._check_gen_eig(A, B, atol_homog=5e-13, atol=5e-13) - - def test_falker(self): - # Test matrices giving some Nan generalized eigenvalues. diff --git a/dev-python/scipy/scipy-1.11.3-r2.ebuild b/dev-python/scipy/scipy-1.11.3-r2.ebuild deleted file mode 100644 index ada4553734a9..000000000000 --- a/dev-python/scipy/scipy-1.11.3-r2.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE="threads(+)" - -inherit flag-o-matic fortran-2 distutils-r1 multiprocessing - -DESCRIPTION="Scientific algorithms library for Python" -HOMEPAGE=" - https://scipy.org/ - https://github.com/scipy/scipy/ - https://pypi.org/project/scipy/ -" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - - # Need submodules, so git for now. - EGIT_REPO_URI="https://github.com/scipy/scipy" - EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" - EGIT_SUBMODULES=( '*' ) -else - inherit pypi - - # Upstream is often behind with doc updates - #DOC_PV=${PV} - DOC_PV=1.11.0 - - SRC_URI+=" - doc? ( - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip - )" - - if [[ ${PV} != *rc* ]] ; then - KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86" - fi -fi - -LICENSE="BSD LGPL-2" -SLOT="0" -IUSE="doc +fortran test-rust" - -# umfpack is technically optional but it's preferred to have it available. -DEPEND=" - >=dev-python/numpy-1.21.6:=[lapack,${PYTHON_USEDEP}] - sci-libs/arpack:= - sci-libs/umfpack - virtual/cblas - >=virtual/lapack-3.8 -" -RDEPEND=" - ${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-lang/swig - >=dev-python/cython-0.29.35[${PYTHON_USEDEP}] - >=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}] - >=dev-python/pybind11-2.10.4[${PYTHON_USEDEP}] - >=dev-build/meson-1.1.0 - !kernel_Darwin? ( dev-util/patchelf ) - virtual/pkgconfig - doc? ( app-arch/unzip ) - fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) - test? ( - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) - test-rust? ( - dev-python/pooch[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_unpack() { - default - - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -python_configure_all() { - # https://github.com/scipy/scipy/pull/19857 - # Fixed in 1.13.0 - filter-lto - DISTUTILS_ARGS=( - -Dblas=blas - -Dlapack=lapack - -Duse-pythran=$(usex fortran true false) - ) -} - -python_test() { - cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - - local EPYTEST_DESELECT=( - # Network - scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all - scipy/datasets/tests/test_data.py::TestDatasets::test_ascent - scipy/datasets/tests/test_data.py::TestDatasets::test_face - scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram - - # Precision issue with diff. blas? - scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799 - - # Crashes with assertion, not a regression - # https://github.com/scipy/scipy/issues/19321 - scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object - - # timeouts - scipy/sparse/linalg/tests/test_propack.py::test_examples - # hang or incredibly slow - scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient - scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient - ) - local EPYTEST_IGNORE=() - - if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then - EPYTEST_IGNORE+=( - scipy/datasets/tests/test_data.py - ) - fi - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # fd leaks in tests - # https://github.com/scipy/scipy/issues/19553 - scipy/fft/_pocketfft/tests/test_real_transforms.py - # TODO - 'scipy/special/tests/test_data.py::test_boost[]' - ) - ;; - esac - - epytest -n "$(makeopts_jobs)" --dist=worksteal scipy -} - -python_install_all() { - use doc && local HTML_DOCS=( "${WORKDIR}"/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/scipy/scipy-1.11.4-r1.ebuild b/dev-python/scipy/scipy-1.11.4-r1.ebuild deleted file mode 100644 index 57a88fe87cf2..000000000000 --- a/dev-python/scipy/scipy-1.11.4-r1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE="threads(+)" - -inherit flag-o-matic fortran-2 distutils-r1 multiprocessing - -DESCRIPTION="Scientific algorithms library for Python" -HOMEPAGE=" - https://scipy.org/ - https://github.com/scipy/scipy/ - https://pypi.org/project/scipy/ -" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - - # Need submodules, so git for now. - EGIT_REPO_URI="https://github.com/scipy/scipy" - EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" - EGIT_SUBMODULES=( '*' ) -else - inherit pypi - - # Upstream is often behind with doc updates - #DOC_PV=${PV} - DOC_PV=1.11.2 - - SRC_URI+=" - doc? ( - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip - )" - - if [[ ${PV} != *rc* ]] ; then - KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" - fi -fi - -LICENSE="BSD LGPL-2" -SLOT="0" -IUSE="doc +fortran test-rust" - -# umfpack is technically optional but it's preferred to have it available. -DEPEND=" - >=dev-python/numpy-1.21.6:=[lapack,${PYTHON_USEDEP}] - sci-libs/arpack:= - sci-libs/umfpack - virtual/cblas - >=virtual/lapack-3.8 -" -RDEPEND=" - ${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-lang/swig - >=dev-python/cython-0.29.35[${PYTHON_USEDEP}] - >=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}] - >=dev-python/pybind11-2.10.4[${PYTHON_USEDEP}] - >=dev-build/meson-1.1.0 - !kernel_Darwin? ( dev-util/patchelf ) - virtual/pkgconfig - doc? ( app-arch/unzip ) - fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) - test? ( - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) - test-rust? ( - dev-python/pooch[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_unpack() { - default - - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -python_configure_all() { - # https://github.com/scipy/scipy/pull/19857 - # Fixed in 1.13.0 - filter-lto - DISTUTILS_ARGS=( - -Dblas=blas - -Dlapack=lapack - -Duse-pythran=$(usex fortran true false) - ) -} - -python_test() { - cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - - local EPYTEST_DESELECT=( - # Network - scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all - scipy/datasets/tests/test_data.py::TestDatasets::test_ascent - scipy/datasets/tests/test_data.py::TestDatasets::test_face - scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram - - # Precision issue with diff. blas? - scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799 - - # Crashes with assertion, not a regression - # https://github.com/scipy/scipy/issues/19321 - scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object - - # timeouts - scipy/sparse/linalg/tests/test_propack.py::test_examples - # hang or incredibly slow - scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient - scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient - ) - local EPYTEST_IGNORE=() - - if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then - EPYTEST_IGNORE+=( - scipy/datasets/tests/test_data.py - ) - fi - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # fd leaks in tests - # https://github.com/scipy/scipy/issues/19553 - scipy/fft/_pocketfft/tests/test_real_transforms.py - # TODO - 'scipy/special/tests/test_data.py::test_boost[]' - ) - ;; - esac - - epytest -n "$(makeopts_jobs)" --dist=worksteal scipy -} - -python_install_all() { - use doc && local HTML_DOCS=( "${WORKDIR}"/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/scipy/scipy-1.12.0-r1.ebuild b/dev-python/scipy/scipy-1.12.0-r1.ebuild deleted file mode 100644 index d3dff15df08b..000000000000 --- a/dev-python/scipy/scipy-1.12.0-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE="threads(+)" - -inherit flag-o-matic fortran-2 distutils-r1 - -DESCRIPTION="Scientific algorithms library for Python" -HOMEPAGE=" - https://scipy.org/ - https://github.com/scipy/scipy/ - https://pypi.org/project/scipy/ -" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - - # Need submodules, so git for now. - EGIT_REPO_URI="https://github.com/scipy/scipy" - EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" - EGIT_SUBMODULES=( '*' ) -else - inherit pypi - - # Upstream is often behind with doc updates - #DOC_PV=${PV} - DOC_PV=1.11.2 - - SRC_URI+=" - doc? ( - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip - )" - - if [[ ${PV} != *rc* ]] ; then - KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - fi -fi - -LICENSE="BSD LGPL-2" -SLOT="0" -IUSE="doc +fortran test-rust" - -# umfpack is technically optional but it's preferred to have it available. -DEPEND=" - >=dev-python/numpy-1.21.6:=[lapack,${PYTHON_USEDEP}] - sci-libs/arpack:= - sci-libs/umfpack - virtual/cblas - >=virtual/lapack-3.8 -" -RDEPEND=" - ${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-lang/swig - >=dev-python/cython-0.29.35[${PYTHON_USEDEP}] - >=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}] - >=dev-python/pybind11-2.10.4[${PYTHON_USEDEP}] - >=dev-build/meson-1.1.0 - !kernel_Darwin? ( dev-util/patchelf ) - virtual/pkgconfig - doc? ( app-arch/unzip ) - fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) - test-rust? ( - dev-python/pooch[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_unpack() { - default - - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -python_configure_all() { - # https://github.com/scipy/scipy/pull/19857 - # Fixed in 1.13.0 - filter-lto - DISTUTILS_ARGS=( - -Dblas=blas - -Dlapack=lapack - -Duse-pythran=$(usex fortran true false) - ) -} - -python_test() { - cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - - local EPYTEST_DESELECT=( - # Network - scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all - scipy/datasets/tests/test_data.py::TestDatasets::test_ascent - scipy/datasets/tests/test_data.py::TestDatasets::test_face - scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram - - # Precision issue with diff. blas? - scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799 - - # Crashes with assertion, not a regression - # https://github.com/scipy/scipy/issues/19321 - scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object - - # timeouts - scipy/sparse/linalg/tests/test_propack.py::test_examples - # hang or incredibly slow - scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient - scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient - ) - local EPYTEST_IGNORE=() - - if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then - EPYTEST_IGNORE+=( - scipy/datasets/tests/test_data.py - ) - fi - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # fd leaks in tests - # https://github.com/scipy/scipy/issues/19553 - scipy/fft/_pocketfft/tests/test_real_transforms.py - # TODO - 'scipy/special/tests/test_data.py::test_boost[]' - ) - ;; - esac - - epytest scipy -} - -python_install_all() { - use doc && local HTML_DOCS=( "${WORKDIR}"/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/scipy/scipy-1.13.0.ebuild b/dev-python/scipy/scipy-1.13.0.ebuild deleted file mode 100644 index f361a013c952..000000000000 --- a/dev-python/scipy/scipy-1.13.0.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE="threads(+)" - -inherit fortran-2 distutils-r1 - -DESCRIPTION="Scientific algorithms library for Python" -HOMEPAGE=" - https://scipy.org/ - https://github.com/scipy/scipy/ - https://pypi.org/project/scipy/ -" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - - # Need submodules, so git for now. - EGIT_REPO_URI="https://github.com/scipy/scipy" - EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" - EGIT_SUBMODULES=( '*' ) -else - inherit pypi - - # Upstream is often behind with doc updates - DOC_PV=${PV} - - SRC_URI+=" - doc? ( - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip - )" - - if [[ ${PV} != *rc* ]] ; then - KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" - fi -fi - -LICENSE="BSD LGPL-2" -SLOT="0" -IUSE="doc +fortran test-rust" - -# umfpack is technically optional but it's preferred to have it available. -DEPEND=" - >=dev-python/numpy-1.22.4:=[lapack,${PYTHON_USEDEP}] - sci-libs/arpack:= - sci-libs/umfpack - virtual/cblas - >=virtual/lapack-3.8 -" -RDEPEND=" - ${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-lang/swig - >=dev-python/cython-3.0.8[${PYTHON_USEDEP}] - >=dev-python/meson-python-0.15.0[${PYTHON_USEDEP}] - >=dev-python/pybind11-2.12.0[${PYTHON_USEDEP}] - >=dev-build/meson-1.1.0 - !kernel_Darwin? ( dev-util/patchelf ) - virtual/pkgconfig - doc? ( app-arch/unzip ) - fortran? ( >=dev-python/pythran-0.14.0[${PYTHON_USEDEP}] ) - test? ( - >=dev-python/hypothesis-6.30[${PYTHON_USEDEP}] - ) - test-rust? ( - dev-python/pooch[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_unpack() { - default - - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -python_configure_all() { - DISTUTILS_ARGS=( - -Dblas=blas - -Dlapack=lapack - -Duse-pythran=$(usex fortran true false) - ) - - # hide real scipy, to prevent pythran crashing when scipy is being - # rebuilt for new numpy ABI - # https://github.com/serge-sans-paille/pythran/issues/2194 - cat >> "${T}/scipy.py" <<-EOF || die - raise ImportError("hide real scipy") - EOF -} - -python_compile() { - local -x PYTHONPATH="${T}${PYTHONPATH+:${PYTHONPATH}}" - distutils-r1_python_compile -} - -python_test() { - cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - - local EPYTEST_DESELECT=( - # Network - scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all - scipy/datasets/tests/test_data.py::TestDatasets::test_ascent - scipy/datasets/tests/test_data.py::TestDatasets::test_face - scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram - - # Precision issue with diff. blas? - scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799 - - # Crashes with assertion, not a regression - # https://github.com/scipy/scipy/issues/19321 - scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object - - # timeouts - scipy/sparse/linalg/tests/test_propack.py::test_examples - # hang or incredibly slow - scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient - scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient - - # TODO - scipy/optimize/tests/test_minimize_constrained.py::TestTrustRegionConstr::test_list_of_problems - ) - local EPYTEST_IGNORE=() - - if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then - EPYTEST_IGNORE+=( - scipy/datasets/tests/test_data.py - ) - fi - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # fd leaks in tests - # https://github.com/scipy/scipy/issues/19553 - scipy/fft/_pocketfft/tests/test_real_transforms.py - # TODO - 'scipy/special/tests/test_data.py::test_boost[]' - # missing dict.__ror__ - # https://github.com/pypy/pypy/issues/4934 - 'scipy/sparse/tests/test_dok.py::test_dunder_ror[dok_matrix]' - ) - ;; - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest scipy -} - -python_install_all() { - use doc && local HTML_DOCS=( "${WORKDIR}"/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/scipy/scipy-1.13.1.ebuild b/dev-python/scipy/scipy-1.13.1.ebuild deleted file mode 100644 index 5200331cde1f..000000000000 --- a/dev-python/scipy/scipy-1.13.1.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE="threads(+)" - -inherit fortran-2 distutils-r1 - -DESCRIPTION="Scientific algorithms library for Python" -HOMEPAGE=" - https://scipy.org/ - https://github.com/scipy/scipy/ - https://pypi.org/project/scipy/ -" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - - # Need submodules, so git for now. - EGIT_REPO_URI="https://github.com/scipy/scipy" - EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" - EGIT_SUBMODULES=( '*' ) -else - inherit pypi - - # Upstream is often behind with doc updates - DOC_PV=${PV} - - SRC_URI+=" - doc? ( - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip - )" - - if [[ ${PV} != *rc* ]] ; then - KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" - fi -fi - -LICENSE="BSD LGPL-2" -SLOT="0" -IUSE="doc +fortran test-rust" - -# umfpack is technically optional but it's preferred to have it available. -DEPEND=" - >=dev-python/numpy-1.22.4:=[lapack,${PYTHON_USEDEP}] - sci-libs/arpack:= - sci-libs/umfpack - virtual/cblas - >=virtual/lapack-3.8 -" -RDEPEND=" - ${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-lang/swig - >=dev-python/cython-3.0.8[${PYTHON_USEDEP}] - >=dev-python/meson-python-0.15.0[${PYTHON_USEDEP}] - >=dev-python/pybind11-2.12.0[${PYTHON_USEDEP}] - >=dev-build/meson-1.1.0 - !kernel_Darwin? ( dev-util/patchelf ) - virtual/pkgconfig - doc? ( app-arch/unzip ) - fortran? ( >=dev-python/pythran-0.14.0[${PYTHON_USEDEP}] ) - test? ( - >=dev-python/hypothesis-6.30[${PYTHON_USEDEP}] - ) - test-rust? ( - dev-python/pooch[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -PATCHES=( - # https://github.com/scipy/scipy/pull/20914 - "${FILESDIR}/${P}-test.patch" -) - -src_unpack() { - default - - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -python_configure_all() { - DISTUTILS_ARGS=( - -Dblas=blas - -Dlapack=lapack - -Duse-pythran=$(usex fortran true false) - ) - - # hide real scipy, to prevent pythran crashing when scipy is being - # rebuilt for new numpy ABI - # https://github.com/serge-sans-paille/pythran/issues/2194 - cat >> "${T}/scipy.py" <<-EOF || die - raise ImportError("hide real scipy") - EOF -} - -python_compile() { - local -x PYTHONPATH="${T}${PYTHONPATH+:${PYTHONPATH}}" - distutils-r1_python_compile -} - -python_test() { - cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - - local EPYTEST_DESELECT=( - # Network - scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all - scipy/datasets/tests/test_data.py::TestDatasets::test_ascent - scipy/datasets/tests/test_data.py::TestDatasets::test_face - scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram - - # Precision issue with diff. blas? - scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799 - - # Crashes with assertion, not a regression - # https://github.com/scipy/scipy/issues/19321 - scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object - - # timeouts - scipy/sparse/linalg/tests/test_propack.py::test_examples - # hang or incredibly slow - scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient - scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient - - # TODO - scipy/optimize/tests/test_minimize_constrained.py::TestTrustRegionConstr::test_list_of_problems - ) - local EPYTEST_IGNORE=() - - if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then - EPYTEST_IGNORE+=( - scipy/datasets/tests/test_data.py - ) - fi - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # fd leaks in tests - # https://github.com/scipy/scipy/issues/19553 - scipy/fft/_pocketfft/tests/test_real_transforms.py - # TODO - 'scipy/special/tests/test_data.py::test_boost[]' - # missing dict.__ror__ - # https://github.com/pypy/pypy/issues/4934 - 'scipy/sparse/tests/test_dok.py::test_dunder_ror[dok_matrix]' - ) - ;; - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest scipy -} - -python_install_all() { - use doc && local HTML_DOCS=( "${WORKDIR}"/html/. ) - - distutils-r1_python_install_all -}