gentoo auto-resync : 23:12:2024 - 06:31:00

3 files changed, 4 insertions, 232 deletions

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 14f7aea069b7..aa18ab70139f 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,14 +1,12 @@
 AUX numpy-2.0.2-setuptools-74.patch 1108 BLAKE2B caaf54f911a6a260d0311c017be13620bb8386df122f62886aeff127c468cc5d7fd9ab2a8b55e4cf15330624b605e1caa4585b840bda2a9dcf2bcee307ee59cb SHA512 ff1280c6e17d580e9b762c29073f81131f30ae07890925874646defb2df47cfbfb1127262097df8ec9b15bc2c7fb44dc807013eccabc377eda5c98a1aaad7fa3
 DIST numpy-1.26.4.tar.gz 15786129 BLAKE2B ee759d3a857111bc494d5e989a7b005375d942b2a89cda69be4a3bd7c6cb195003fd2a8a0535f1858d8977ff688b0ec36360dcba9c3160206eedce5e28f191ef SHA512 f7121ab4099fa0686f9c095d456baa4a5869d651d7b7a06385f885f329cf08f11024b5df5e7b4ee705970062a8102ec4f709512eabbfd5c9fccce4ef83b9c208
 DIST numpy-2.0.2.tar.gz 18902015 BLAKE2B 63f993e3429bff1dac1ff79fad23a36a2493fd2c8a825ef96b6b87d82b0e68393d2829c5ecd9065df345c8bfbb1f8f385077f154264f7d2810d311d1d6672bd7 SHA512 d769fd4f07e082fae1661c6856d6d726e189f6931f3028c6819f9806aa9dfd15ab2b49c48b94bfd925eb3f74fddb6f044c9ba93bbb785b5476440dd1cf0b4999
-DIST numpy-2.1.2.tar.gz 18878063 BLAKE2B b976b72bb113fc9c5e5a17c9d89038b6a11f2a09521ef46a610dd1fd04b0b11f08491728b2397ca5e3e9613aab3ad8c63b2b15a6378c535cf0e735226d517617 SHA512 3d69f6583e093e8fd0f441ec7dc4658c88fb714bb29574cd9510091ba059553f79c52492037353caf50b6cff1f7bd1e2501e445c7adde41bd9e08bab363e06e9
 DIST numpy-2.1.3.tar.gz 20166090 BLAKE2B 746d343b17039d58738358168a613a2b85d6fb9cad1eeb367b851cd8d46fd42647990b47f0b4fb794ce5c4da2fa0a5d61e3ba42ea2f1945680f36cff31bb7b0d SHA512 59568acda3a77160908a23c354f0574970cb3daeea79ab535762a75a5f3a52a5cedd5754bb507cc238cf5948b37f0045523ed59c04cf6fc4a94ed22b9b77b8c1
 DIST numpy-2.2.0.tar.gz 20225497 BLAKE2B 87450bbe52085edd55cd99303bbb7d71b44bf14be8326bffe46886cf14d442bd51443b1c89e3f04ce13ee7724e39c9a2f302e2394f05781430e66efd8347c3dc SHA512 3a0776ac175beb82b2aea0d384b60896cd1ee1055b414765965edd621839c8292fadaaaa18482c975c8e34319578cb20db4aa8f4ad06bd41a1833563c55fc3e9
-DIST numpy-2.2.0rc1.tar.gz 20214049 BLAKE2B 17b5afd8e4242c1f8eaaf7e052161277623703ed99bc2969b27cf447b8d3cff6325c3720a9ba5a206241ccd2c9332d6747ce0426432e5a60a31b580f658b939c SHA512 27f9944cb00c013b072f196ff5ff25dc461461d56b42cd889df4bdf6a274179f477e0c2e192bab3ca27f248dc7dc88a0a1db4f15a35bb47c619259b350c3deb9
+DIST numpy-2.2.1.tar.gz 20227662 BLAKE2B 2b963af971b0fff6ea5802aa6e4b7ed33fcb885aec40b529cd97de9b5887697cd3cd857ffdedcce7f9b9d077ed388947683bc0b3f8fa7ef724acf382378da2c5 SHA512 15876635bd2b26a0f511472c447ff95102f3016eea02e5117d7f5a1ae4782cd656c10706e8b2e00adee0920a7673f216056fb842700d634fbb5630b672f26ddf
 EBUILD numpy-1.26.4.ebuild 5160 BLAKE2B 52a7676802baa6c09d2c61445253434394b20cd7c12e7c2d17ceab3f391e15c9e40ee3e1c0e37ee7fc300840910d79f070104aa99169040eb21cec6678ce5ac7 SHA512 daa4452207419e0fa283844a6c7fffb58b508db0be25a09087ea36dd8de476ca0c0b3b2dee16f47738a7e00e17a5efb288b64e558d649da71d3a47dbca7d8443
 EBUILD numpy-2.0.2-r1.ebuild 5981 BLAKE2B 5adc5fa3b06c8e00cd79304b874d659ad00effcbff7062531ce4d4a6779b37ad2d7bf5b6eb6d7730d5ab6fa607cf79adac8ea9467a131aaad2ba210bd76d0e11 SHA512 088cd7cd334601dd1f8a0fc3c08d40c4a0ec1a539e00c7d8c99a9f0a6aa24b44f721499af3052ace1bd46d2c62b0d0238b5046a9a769bec9317b6d8e20d347d5
-EBUILD numpy-2.1.2.ebuild 6253 BLAKE2B aef7d9d5ae9cef32ce148a6ec9a6a582f653b4b73c868f1a9484ca0130fc1d0ff3f246fee32af0b488acafcafbce374d14b539f53ff38e7d425a2967a4733cda SHA512 0d76e3662331bb6900afa0178c6c495b07494045369b3db382c6b9880b0396857aa1e7643e5046e8145d5123131b360e6d238360f672accc44d7bcbb21e88195
 EBUILD numpy-2.1.3.ebuild 6247 BLAKE2B 45708bdd07aa8ce0794a99e553b02a80e174d56a1f472081ec98cf44f4dc5b6c5db4da0c37f3b9a5c7180ce1d851ae3b407a9b894bec144053b77bd8c65bb7da SHA512 4b849c19f62b0305f76a7409ff8510052afe91c07afc5a709303d7758ff3fe8afeb16b006d1b6b4a5c3c38a5b04b60db0b06efdc6e02f62b0799738cf5da2744
 EBUILD numpy-2.2.0.ebuild 5875 BLAKE2B 1731e1caeda8c15012e9f31dd4c05a5094d6917c04e48f9eec7b6050857f14876461ff12e283b9329466a6578cc294bf063e00e8c86f070f7732d96d2717ec30 SHA512 a7dc285d05435b4a59ac6475065c589c3b9a98bee3dc9708a497988250eecaa7a5744bbec8a3566054483d467739f7e0ff188fbdfedf904444d6dd3ab5da31a0
-EBUILD numpy-2.2.0_rc1.ebuild 6154 BLAKE2B 4930732a5a24f14f266e6962ab46f96930e9ef7a402128b64122960eb10d85e2cb71616299ac22ef50e58f8413bce521cea4d1744e3ee3e6b96c4830c7d0491e SHA512 06542d396c774037c1b9eedd4e769864c83d1fe4e1a66d068360bbfa2da0890f6b22add066ce57b8bcb14de977552417ab3e25e8816db7c6f747c518628a7c67
+EBUILD numpy-2.2.1.ebuild 5806 BLAKE2B 30de54c69d88fcb273264b2ec26580590d48aa2b82348c6eaba8ba287ab6c620058ef4d91b48456433df85eabc9976a03950f6cb3264e4fedf6f1bfdcef30864 SHA512 abce938004672826d7b5f8cbf3c737e36454cfcd7abd9de66cda053dd742060a2c3fce88689363a6c918e72e6abf8f64e4f3c6633d6b3520aa1e992b6696f942
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/numpy-2.2.0_rc1.ebuild b/dev-python/numpy/numpy-2.2.0_rc1.ebuild
deleted file mode 100644
index b2ba0faa3a1c..000000000000
--- a/dev-python/numpy/numpy-2.2.0_rc1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 pypi
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0/2"
-# +lapack because the internal fallbacks are pretty slow. Building without blas
-# is barely supported anyway, see bug #914358.
-IUSE="big-endian +lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-build/meson-1.1.0
-	>=dev-python/cython-3.0.6[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# https://bugs.gentoo.org/925367
-	vrndq_f32
-)
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# bug #922457
-	filter-lto
-	# https://github.com/numpy/numpy/issues/25004
-	append-flags -fno-strict-aliasing
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dallow-noblas=$(usex !lapack true false)
-		-Dblas=$(usev lapack cblas)
-		-Dlapack=$(usev lapack lapack)
-		# TODO: cpu-* options
-	)
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Very disk-and-memory-hungry
-		numpy/lib/tests/test_io.py::TestSaveTxt::test_large_zip
-		numpy/lib/tests/test_io.py::TestSavezLoad::test_closing_fid
-		numpy/lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
-
-		# Precision problems
-		numpy/_core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# Runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		numpy/typing/tests/test_typing.py
-		# Uses huge amount of memory
-		numpy/core/tests/test_mem_overlap.py
-	)
-
-	if [[ $(uname -m) == armv8l ]]; then
-		# Degenerate case of arm32 chroot on arm64, bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/_core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	case ${ARCH} in
-		arm)
-			EPYTEST_DESELECT+=(
-				# TODO: warnings
-				numpy/_core/tests/test_umath.py::TestSpecialFloats::test_unary_spurious_fpexception
-
-				# TODO
-				numpy/_core/tests/test_function_base.py::TestLinspace::test_denormal_numbers
-				numpy/f2py/tests/test_kind.py::TestKind::test_real
-				numpy/f2py/tests/test_kind.py::TestKind::test_quad_precisionn
-
-				# require too much memory
-				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
-			)
-			;;
-		hppa)
-			EPYTEST_DESELECT+=(
-				# https://bugs.gentoo.org/942689
-				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype[int]"
-				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype[float]"
-				numpy/f2py/tests/test_kind.py::TestKind::test_real
-				numpy/f2py/tests/test_kind.py::TestKind::test_quad_precision
-				numpy/tests/test_ctypeslib.py::TestAsArray::test_reference_cycles
-				numpy/tests/test_ctypeslib.py::TestAsArray::test_segmentation_fault
-				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_scalar
-				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_subarray
-				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_structure
-				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_structure_aligned
-				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_union
-				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_padded_union
-			)
-			;;
-		ppc|x86)
-			EPYTEST_DESELECT+=(
-				# require too much memory
-				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
-			)
-			;;
-	esac
-
-	if [[ ${CHOST} == powerpc64le-* ]]; then
-		EPYTEST_DESELECT+=(
-			# long double thingy
-			numpy/_core/tests/test_scalarprint.py::TestRealScalars::test_ppc64_ibm_double_double128
-		)
-	fi
-
-	if use big-endian; then
-		EPYTEST_DESELECT+=(
-			# ppc64 and sparc
-			numpy/linalg/tests/test_linalg.py::TestDet::test_generalized_sq_cases
-			numpy/linalg/tests/test_linalg.py::TestDet::test_sq_cases
-			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]"
-			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]"
-			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]"
-			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]"
-		)
-	fi
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				numpy/_core/tests/test_nditer.py::test_iter_refcount
-				numpy/_core/tests/test_limited_api.py::test_limited_api
-				numpy/f2py/tests/test_f2py2e.py::test_gh22819_cli
-			)
-			;&
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# flaky
-				numpy/f2py/tests/test_crackfortran.py
-				numpy/f2py/tests/test_data.py::TestData::test_crackedlines
-				numpy/f2py/tests/test_data.py::TestDataF77::test_crackedlines
-				numpy/f2py/tests/test_f2py2e.py::test_gen_pyf
-			)
-			;;
-	esac
-
-	if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then
-		# depends on importing numpy.random from system namespace
-		EPYTEST_DESELECT+=(
-			'numpy/random/tests/test_extending.py::test_cython'
-		)
-	fi
-
-	if has_version ">=dev-python/setuptools-74[${PYTHON_USEDEP}]"; then
-		# msvccompiler removal
-		EPYTEST_DESELECT+=(
-			numpy/tests/test_public_api.py::test_all_modules_are_expected_2
-			numpy/tests/test_public_api.py::test_api_importable
-		)
-		EPYTEST_IGNORE+=(
-			numpy/distutils/tests/test_mingw32ccompiler.py
-			numpy/distutils/tests/test_system_info.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-2.1.2.ebuild b/dev-python/numpy/numpy-2.2.1.ebuild
index 0382087fb9cb..a9648e63599e 100644
--- a/dev-python/numpy/numpy-2.1.2.ebuild
+++ b/dev-python/numpy/numpy-2.2.1.ebuild
@@ -44,6 +44,7 @@ BDEPEND="
 		' 'python*')
 		dev-python/charset-normalizer[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
 	)
 "
@@ -160,25 +161,6 @@ python_test() {
 		)
 	fi
 
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				numpy/_core/tests/test_nditer.py::test_iter_refcount
-				numpy/_core/tests/test_limited_api.py::test_limited_api
-				numpy/f2py/tests/test_f2py2e.py::test_gh22819_cli
-			)
-			;&
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# flaky
-				numpy/f2py/tests/test_crackfortran.py
-				numpy/f2py/tests/test_data.py::TestData::test_crackedlines
-				numpy/f2py/tests/test_data.py::TestDataF77::test_crackedlines
-				numpy/f2py/tests/test_f2py2e.py::test_gen_pyf
-			)
-			;;
-	esac
-
 	if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then
 		# depends on importing numpy.random from system namespace
 		EPYTEST_DESELECT+=(
@@ -200,7 +182,7 @@ python_test() {
 
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest
+	epytest -p rerunfailures --reruns=5
 }
 
 python_install_all() {