gentoo auto-resync : 22:09:2024 - 14:47:12

5 files changed, 2 insertions, 414 deletions

diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index dda62ebefde9..634e147cbbea 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,8 +1,4 @@
-AUX scipy-1.14.0-np2.patch 2765 BLAKE2B b243c73d6f3671f3d0e70bdf21b2f956da6a1b8dea849dadbf6a5a62d3fdb858db6fbd3b15c3c6b4497d95ffda3665605295c3433c42af1b415f27be56c7a73e SHA512 855f025d5b49eef9a480af2f050f7a6d9957c16a04d8091500877528767b5e70859ce0bd8a367ab676a68f1f21370996d7bf8e68fa99bbc6f330460563567e60
-DIST scipy-1.14.0.tar.gz 58618870 BLAKE2B bf9ed05628b02dc058555402995caae722cf6802bde80387d4e4477ec533589a66ca70b5dd44a32ddac652c7c69300406434b80e7cbc9aee2a78ae6b26ee4c2b SHA512 6579d988a2093602f5fc82203bbb5dc5690a95032484b5d5bd843d1e7995b3b89d802c7b38ec0345c1f3d8e22c98fb92b3982a1eadfcdf63607f929a52b56abf
 DIST scipy-1.14.1.tar.gz 58620554 BLAKE2B 5cb383648a5f3b8d0d321efcd66992212c59ce3fc3dbf812a2fa97c09cb18831b280af6c7689553644f83c531a266e9152e2a139a12aed08307e1ed64deea78e SHA512 20e3cf13590f76dfdc40ca8f90e6d5a68502e74415f37fa24fdb8169098e1d7f0aa631ae742c8c3e9573fa7d63da61986d51f35f090a3785873ae0761f7fcfa6
 DIST scipy-html-1.14.0.zip 65723829 BLAKE2B ba47dbf00a5d2a53a9addc5ea68ab18b42f211a018b89aa4b0b57ff0dee02e410a3effc59ddf8fbbc5aa33075d45d86880aed3a14068da5bd7b62ee526199967 SHA512 93be0bafcc64cea1ba130bbcc77c0741acc4f819c84a5030391a22657a1bc63abe8434a2723f66b7ad04c0809dc6d02e3a97ffb8d94bd3d4a4bb759ee796b475
-EBUILD scipy-1.14.0-r1.ebuild 4343 BLAKE2B 45caf57e6f6f62287150efd0e7a8d6c484a58332027cfa05042d76833f0a26ab5e35c177c2eed2b85a332ac41b206e98ea254e6010257544bc21f15fe176c850 SHA512 af45e4f2a2adcc88dee971b865be13026e1853a76964844c533ac3c2c63ba2013f566224a746500f4851845265c95e220a0ee0b8ada5bb1fa3ea129c48b80e9d
-EBUILD scipy-1.14.0.ebuild 4200 BLAKE2B e09240f54150aa756aa33388670a242835fafc7bfc1f4373156e72eee64176e44f49681fd2e88e87ffe8b6d9702b592870dc16f1ea61018f4915a82039f76143 SHA512 aa078bb6fbf623ba13095b1a2a0768f07945c888cb49310ec90ca460f33c9496a410095487e0891b8e93d2807cbb38484cf9ca71cac6629370bf7ea2e6fe004f
-EBUILD scipy-1.14.1.ebuild 4075 BLAKE2B 7dabcc8e4a59017e58201293520671f6ac9017f4dd8aa63c70ed1c561aab3699269e57ef1cfe62dc5104083661ae9f4dd5534a29c37cc35df7ce4216c007790c SHA512 a083fe46aacbe82a3a07192fc911449b172a63a5aa4582066d1c356135c13b45a92c37ae45e8bfcf2a84a9bc31985f0ea71cb23e717e26584b591a29dd266941
+EBUILD scipy-1.14.1.ebuild 4074 BLAKE2B af8379c3048b0e186ea9801aa402ecc26153e456cd71b97e84b84d63aac2087dbfaa38cf73633bd9355f70bee9337614db138504a57f9555b144ede3fcecea85 SHA512 d60d0587d361fcc4c28dbbda186f7d4db650e4f01902c705990948ed715ae125ee09357a2e197a5856a86d4a0e48b564ed5eee8e50ea4c344238a953f1ea8eda
 MISC metadata.xml 953 BLAKE2B a09ea1325a175e349fbc3ca77c5e7b373538ea01147e8544f44b7d4e0c55fbbc2012431fcfe9a3457e82d295e4b5630df1ed69c48ef3462ed9b157af30a1e09a SHA512 74a21c6e1a9bef95b3d74a9513c59d302f473725c04fa32a9991b6108113c0f4b78179ce4a628140e7aa870c24ca60bddf7a00063b6b73dd45110112311371d8
diff --git a/dev-python/scipy/files/scipy-1.14.0-np2.patch b/dev-python/scipy/files/scipy-1.14.0-np2.patch
deleted file mode 100644
index fdb81baa68a6..000000000000
--- a/dev-python/scipy/files/scipy-1.14.0-np2.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 87c4932ca0e4dbe10f918bc5e8096e30fc6557e7 Mon Sep 17 00:00:00 2001
-From: Lucas Colley <lucas.colley8@gmail.com>
-Date: Mon, 29 Jul 2024 17:57:11 +0100
-Subject: [PATCH 1/2] BUG: stats: adapt to `np.floor` type promotion removal
-
-`rv_discrete._cdf` relied on `np.floor` promoting its integer input to `np.float64`. This is no longer the case since numpy/numpy#26766.
-
-[skip cirrus] [skip circle]
----
- scipy/stats/_distn_infrastructure.py     |  2 +-
- scipy/stats/tests/test_discrete_basic.py | 12 ++++++++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/scipy/stats/_distn_infrastructure.py b/scipy/stats/_distn_infrastructure.py
-index a7a0bb66b396..83954af2c11f 100644
---- a/scipy/stats/_distn_infrastructure.py
-+++ b/scipy/stats/_distn_infrastructure.py
-@@ -3392,7 +3392,7 @@ def _cdf_single(self, k, *args):
-         return np.sum(self._pmf(m, *args), axis=0)
- 
-     def _cdf(self, x, *args):
--        k = floor(x)
-+        k = floor(x).astype(np.float64)
-         return self._cdfvec(k, *args)
- 
-     # generic _logcdf, _sf, _logsf, _ppf, _isf, _rvs defined in rv_generic
-diff --git a/scipy/stats/tests/test_discrete_basic.py b/scipy/stats/tests/test_discrete_basic.py
-index 1ebc9371c075..3db2f0666dbd 100644
---- a/scipy/stats/tests/test_discrete_basic.py
-+++ b/scipy/stats/tests/test_discrete_basic.py
-@@ -549,3 +549,15 @@ def test_rv_sample():
-     rng = np.random.default_rng(98430143469)
-     rvs0 = dist.ppf(rng.random(size=100))
-     assert_allclose(rvs, rvs0)
-+
-+def test__pmf_float_input():
-+    # gh-21272
-+    # test that `rvs()` can be computed when `_pmf` requires float input
-+    
-+    class rv_exponential(stats.rv_discrete):
-+        def _pmf(self, i):
-+            return (2/3)*3**(1 - i)
-+    
-+    rv = rv_exponential(a=0.0, b=float('inf'))
-+    rvs = rv.rvs() # should not crash due to integer input to `_pmf`
-+    assert_allclose(rvs, 0)
-
-From fe924edb6564358df24de8b915861d6754c6e94d Mon Sep 17 00:00:00 2001
-From: Matt Haberland <mhaberla@calpoly.edu>
-Date: Sat, 10 Aug 2024 12:15:56 -0700
-Subject: [PATCH 2/2] Update scipy/stats/tests/test_discrete_basic.py
-
-[skip ci]
----
- scipy/stats/tests/test_discrete_basic.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scipy/stats/tests/test_discrete_basic.py b/scipy/stats/tests/test_discrete_basic.py
-index 3db2f0666dbd..2bc53d95228a 100644
---- a/scipy/stats/tests/test_discrete_basic.py
-+++ b/scipy/stats/tests/test_discrete_basic.py
-@@ -559,5 +559,5 @@ def _pmf(self, i):
-             return (2/3)*3**(1 - i)
-     
-     rv = rv_exponential(a=0.0, b=float('inf'))
--    rvs = rv.rvs() # should not crash due to integer input to `_pmf`
-+    rvs = rv.rvs(random_state=42)  # should not crash due to integer input to `_pmf`
-     assert_allclose(rvs, 0)
diff --git a/dev-python/scipy/scipy-1.14.0-r1.ebuild b/dev-python/scipy/scipy-1.14.0-r1.ebuild
deleted file mode 100644
index 1352c9c3bfbd..000000000000
--- a/dev-python/scipy/scipy-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,173 +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..13} )
-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}
-
-	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.23.5:=[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.16.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/21283
-	# (breaks test_sample_scipy in dev-python/sympy)
-	"${FILESDIR}/${P}-np2.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)
-	)
-
-	# https://bugs.gentoo.org/932721
-	has_version '>=dev-python/numpy-2.0.0' && filter-lto
-}
-
-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[<Data for expi: expinti_data_long_ipp-expinti_data_long>]'
-				# missing dict.__ror__
-				# https://github.com/pypy/pypy/issues/4934
-				'scipy/sparse/tests/test_dok.py::test_dunder_ror[dok_matrix]'
-				# mismatched exception message
-				scipy/optimize/tests/test_hessian_update_strategy.py::TestHessianUpdateStrategy::test_initialize_catch_illegal
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# docstring formatting
-				scipy/misc/tests/test_doccer.py::test_decorator
-			)
-			;;
-	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.14.0.ebuild b/dev-python/scipy/scipy-1.14.0.ebuild
deleted file mode 100644
index d92a8af88f7a..000000000000
--- a/dev-python/scipy/scipy-1.14.0.ebuild
+++ /dev/null
@@ -1,167 +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..13} )
-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}
-
-	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.23.5:=[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.16.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)
-	)
-
-	# https://bugs.gentoo.org/932721
-	has_version '>=dev-python/numpy-2.0.0' && filter-lto
-}
-
-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[<Data for expi: expinti_data_long_ipp-expinti_data_long>]'
-				# missing dict.__ror__
-				# https://github.com/pypy/pypy/issues/4934
-				'scipy/sparse/tests/test_dok.py::test_dunder_ror[dok_matrix]'
-				# mismatched exception message
-				scipy/optimize/tests/test_hessian_update_strategy.py::TestHessianUpdateStrategy::test_initialize_catch_illegal
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# docstring formatting
-				scipy/misc/tests/test_doccer.py::test_decorator
-			)
-			;;
-	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.14.1.ebuild b/dev-python/scipy/scipy-1.14.1.ebuild
index 2e1ec6ce7593..3059a8fefe9d 100644
--- a/dev-python/scipy/scipy-1.14.1.ebuild
+++ b/dev-python/scipy/scipy-1.14.1.ebuild
@@ -37,7 +37,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+		KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 	fi
 fi