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 9E6511581C1 for ; Fri, 5 Jul 2024 19:04:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E17842BC113; Fri, 5 Jul 2024 19:04:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 63A1E2BC113 for ; Fri, 5 Jul 2024 19:04:40 +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 9E388343029 for ; Fri, 5 Jul 2024 19:04:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A4A63A1 for ; Fri, 5 Jul 2024 19:04:38 +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: <1720206244.13d8f37a154f23e4aa1991851eabaec11143ba6e.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/files/scipy-1.13.1-test.patch dev-python/scipy/scipy-1.13.1.ebuild X-VCS-Directories: dev-python/scipy/files/ dev-python/scipy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 13d8f37a154f23e4aa1991851eabaec11143ba6e X-VCS-Branch: master Date: Fri, 5 Jul 2024 19:04:38 +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: cffb7b43-0086-4244-9d18-506e873996e5 X-Archives-Hash: e19737075ce38ace8fd7682ccb6982db commit: 13d8f37a154f23e4aa1991851eabaec11143ba6e Author: Michał Górny gentoo org> AuthorDate: Fri Jul 5 19:04:04 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 5 19:04:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13d8f37a dev-python/scipy: Backport a test fix to 1.13.1 Closes: https://bugs.gentoo.org/935383 Signed-off-by: Michał Górny gentoo.org> dev-python/scipy/files/scipy-1.13.1-test.patch | 46 ++++++++++++++++++++++++++ dev-python/scipy/scipy-1.13.1.ebuild | 5 +++ 2 files changed, 51 insertions(+) diff --git a/dev-python/scipy/files/scipy-1.13.1-test.patch b/dev-python/scipy/files/scipy-1.13.1-test.patch new file mode 100644 index 000000000000..e10e8551b757 --- /dev/null +++ b/dev-python/scipy/files/scipy-1.13.1-test.patch @@ -0,0 +1,46 @@ +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.13.1.ebuild b/dev-python/scipy/scipy-1.13.1.ebuild index 6858c42f2bcd..46e6f4a7ea8a 100644 --- a/dev-python/scipy/scipy-1.13.1.ebuild +++ b/dev-python/scipy/scipy-1.13.1.ebuild @@ -78,6 +78,11 @@ BDEPEND=" EPYTEST_XDIST=1 distutils_enable_tests pytest +PATCHES=( + # https://github.com/scipy/scipy/pull/20914 + "${FILESDIR}/${P}-test.patch" +) + src_unpack() { default