gentoo auto-resync : 31:10:2024 - 03:04:18

5 files changed, 35 insertions, 45 deletions

diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index e51e44426fd3..700e3cbead98 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,5 +1,4 @@
-DIST mpmath-1.3.0.tar.gz 508106 BLAKE2B 9d4eebbbb6788dd3ee45c8c30068ef3512043dd09ab626cbaf69b0f6bdf057a6e8c53c34e3dda7627db923f0d536a0bebf83916d8942f4dde9546bb8e0046f33 SHA512 a68028150095d743eae9669a0f70cbe6b7bcb4d27dfad6b1a96575f0885ec7306459a2a464117bab18779883ee8b4293502b4bd0ebd8672767e1d08d38f8b202
+AUX mpmath-1.4.0_alpha2-before-numpy-2.patch 917 BLAKE2B 82ca24da1dd51102192c71a1ac780619dab2e465c10bfb8cc316451449c834a1abf0a1ed5cf8c199da0c06e7c72527f722b736f44cc337a043be3c7942720b00 SHA512 ad6fe4a61896000801b8b03cbd01ce7dcae343297539cd8219f9a95dbfcff82b810b33d4ac6f3f80c55fb3f48ecb73d3453a92308d81b1d5626ae08d3e8db115
 DIST mpmath-1.4.0a2.tar.gz 2079112 BLAKE2B 9d2d99dddd4e800b3860f38ef1955b7d803c928d54a7e5d7b07386a127c5a6477818e3ac5c9f679f596c7a2c21bbf430f0bb2348c70ab77d6a888cfb19c6a218 SHA512 523775f3e7d96fd9e0d2c5e4caf855f62d0b683ac00df9dce4fd50d8764bfcf77282fdb34afb51bc53bb303178e7f0e8b6d72700e530d3ca11e3d365b09fc4de
-EBUILD mpmath-1.3.0-r1.ebuild 855 BLAKE2B 9a51290a8a128467afe77eff887190deaee0327fc175541d316f6c62aef777567e53c7884342ac6082ad5a9eab7081a75a1c7b4dd3090f6cd2f5efe2f85aafb1 SHA512 21ec5b38e62a62dad3907d3828a29221e93c9d86f5fc6284881a5863f82b499d7f0ed3f488c08b31de274d24220d6280571bafdc0abebac36fd24b2cf2c6a019
-EBUILD mpmath-1.4.0_alpha2.ebuild 1973 BLAKE2B baa663519c18229737104ebfb01f05eddf7308a770f7370492d26f64a9718689047a51b3cffcea99a5b0303f7a8b242800d53828015eac216be5edcbcca41c7b SHA512 4711c8443d502f092ccf61f69cbc8b61181a998e1e2271adcfb0f1a690a70bd1b169df9a09e5ca976c46371d28c5df611938634f79b5efb6d7c211dcee11c4f4
-MISC metadata.xml 624 BLAKE2B 8526d1f6329f8cb4d2ee5a9ae73dc5bf3861adce5beaa6a0aaf5abb918de11ad1ab0c5c206331bd4eaeaa7bdeda0c6ea6a2007492825be0545caa121f41abd6c SHA512 dc4c6f5e82ce735e70bdc1bbfbc01f9c1d62c2d46c54a173287a59b90882aa09945da39bb41e7b28f6d0066851e2adf07f0b7033aa77cc5620491864e89f188e
+EBUILD mpmath-1.4.0_alpha2.ebuild 2006 BLAKE2B 37f76f6010e066ccb9ce25c5f84fe97c77908ec860d756f3c03686201775c1a1a78ec6314fee3073b4fdaa9217189abf17c03f2eb301d5c75ed34a1eb79d4f87 SHA512 cd6d9c8830a9b62fe99739275eb1f474e301b31dd8922234e10b84363bb34541cab353f2f63e6a24e32e89c7347dbc5a987f03790430721f870a8c984125d3f1
+MISC metadata.xml 645 BLAKE2B b56183cb416aee2fb297686aaceb2f90e3f6ec0f820200737b6866dfd725fb82f378b1163a377819396ba44c87c3f44b74cf18d086653ed0e08366f6c2aee3c0 SHA512 a8a75c7e0b0fedfc55daff459b745b1b25362fe6bd1439ea1bde60b06f6d689848d6bc2d5f0f57d691a4f41ad3ef0c5f96e12361ec6725abb887ac2373f67615
diff --git a/dev-python/mpmath/files/mpmath-1.4.0_alpha2-before-numpy-2.patch b/dev-python/mpmath/files/mpmath-1.4.0_alpha2-before-numpy-2.patch
new file mode 100644
index 000000000000..bd8674118038
--- /dev/null
+++ b/dev-python/mpmath/files/mpmath-1.4.0_alpha2-before-numpy-2.patch
@@ -0,0 +1,22 @@
+https://github.com/mpmath/mpmath/pull/878
+https://github.com/mpmath/mpmath/commit/728db99cd92dde589dc0cbe89f7f3f444af046ad
+
+From 9dd08e59dff0a0992b92d31e4f614e43881b301d Mon Sep 17 00:00:00 2001
+From: Doug Torrance <dtorrance@piedmont.edu>
+Date: Tue, 15 Oct 2024 18:48:40 -0400
+Subject: [PATCH] Only check for NumPy array copy ValueError w/ NumPy >= 2.0
+
+No such error is raised when using NumPy < 2.0.
+--- a/mpmath/tests/test_matrices.py
++++ b/mpmath/tests/test_matrices.py
+@@ -203,7 +203,8 @@ def test_matrix_numpy():
+ 
+     if sys.version_info < (3, 9):
+         pytest.skip("latest numpy dropped support for CPython 3.8")
+-    pytest.raises(ValueError, lambda: numpy.array(matrix(l), copy=False))
++    if numpy.__version__ >= '2':
++        pytest.raises(ValueError, lambda: numpy.array(matrix(l), copy=False))
+ 
+ def test_interval_matrix_scalar_mult():
+     """Multiplication of iv.matrix and any scalar type"""
+
diff --git a/dev-python/mpmath/metadata.xml b/dev-python/mpmath/metadata.xml
index 416bff3de82c..169f36d41536 100644
--- a/dev-python/mpmath/metadata.xml
+++ b/dev-python/mpmath/metadata.xml
@@ -13,7 +13,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<stabilize-allarches/>
+	<!-- no ALLARCHES: fragile to FP issues -->
 	<upstream>
 		<remote-id type="pypi">mpmath</remote-id>
 		<remote-id type="github">mpmath/mpmath</remote-id>
diff --git a/dev-python/mpmath/mpmath-1.3.0-r1.ebuild b/dev-python/mpmath/mpmath-1.3.0-r1.ebuild
deleted file mode 100644
index 814e9686c59d..000000000000
--- a/dev-python/mpmath/mpmath-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,35 +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 optfeature pypi virtualx
-
-DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="
-	https://mpmath.org/
-	https://github.com/mpmath/mpmath/
-	https://pypi.org/project/mpmath/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" mpmath/tests/runtests.py -local || die "Tests failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "gmp support" dev-python/gmpy
-	optfeature "matplotlib support" dev-python/matplotlib
-}
diff --git a/dev-python/mpmath/mpmath-1.4.0_alpha2.ebuild b/dev-python/mpmath/mpmath-1.4.0_alpha2.ebuild
index eef610f1e8c6..520d08f83513 100644
--- a/dev-python/mpmath/mpmath-1.4.0_alpha2.ebuild
+++ b/dev-python/mpmath/mpmath-1.4.0_alpha2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
@@ -32,14 +32,18 @@ BDEPEND="
 			dev-python/gmpy[${PYTHON_USEDEP}]
 		' 'python3*')
 		!mips? (
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-			$(python_gen_cond_dep '
-				dev-python/ipython[${PYTHON_USEDEP}]
-			' 3.{10..12})
+			dev-python/ipython[${PYTHON_USEDEP}]
+			!hppa? (
+				dev-python/matplotlib[${PYTHON_USEDEP}]
+			)
 		)
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0_alpha2-before-numpy-2.patch
+)
+
 EPYTEST_XDIST=1
 distutils_enable_tests pytest