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 EFABB158089 for ; Tue, 7 Nov 2023 20:35:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 355DD2BC023; Tue, 7 Nov 2023 20:35:06 +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 11C362BC023 for ; Tue, 7 Nov 2023 20:35:06 +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 537C0335D42 for ; Tue, 7 Nov 2023 20:35:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC6C21330 for ; Tue, 7 Nov 2023 20:35:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1699389237.4371dc93a2cc3cc988f908a41780381ea087d7cc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/numpy/files/numpy-1.26.1-alpha.patch dev-python/numpy/numpy-1.26.1.ebuild X-VCS-Directories: dev-python/numpy/files/ dev-python/numpy/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4371dc93a2cc3cc988f908a41780381ea087d7cc X-VCS-Branch: master Date: Tue, 7 Nov 2023 20:35:03 +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: a182a60b-cdc5-46fd-8bcd-1dc08ede21d3 X-Archives-Hash: feed9935e25e3e21586aa94683f9b814 commit: 4371dc93a2cc3cc988f908a41780381ea087d7cc Author: Matoro Mahri matoro tk> AuthorDate: Mon Nov 6 18:25:31 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 7 20:33:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4371dc93 dev-python/numpy: fix alpha issues One test that imports numpy from system namespace, disable this test unless the current version of numpy is already installed. One test that needs source code patch, submitted upstream. See: https://github.com/numpy/numpy/pull/25078 Bug: https://bugs.gentoo.org/909738 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Sam James gentoo.org> dev-python/numpy/files/numpy-1.26.1-alpha.patch | 25 +++++++++++++++++++++++++ dev-python/numpy/numpy-1.26.1.ebuild | 8 ++++++++ 2 files changed, 33 insertions(+) diff --git a/dev-python/numpy/files/numpy-1.26.1-alpha.patch b/dev-python/numpy/files/numpy-1.26.1-alpha.patch new file mode 100644 index 000000000000..a0b2ca2eda91 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.26.1-alpha.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/909738 +https://github.com/numpy/numpy/pull/25078 + +commit 43aaf2093d8dfb3c1fea5d409ea4aa1d0f77816f +Author: matoro +Date: Mon Nov 6 10:21:32 2023 -0500 + + BUG: alpha doesn't use REAL(10) + + Same as e.g. loongarch per gh-24904. At this point seems like it should + be more of an exclude list than an include one... + +diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py +index f352bbaa2..d17b052f9 100755 +--- a/numpy/f2py/crackfortran.py ++++ b/numpy/f2py/crackfortran.py +@@ -2452,7 +2452,7 @@ def _selected_real_kind_func(p, r=0, radix=0): + if p < 16: + return 8 + machine = platform.machine().lower() +- if machine.startswith(('aarch64', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')): ++ if machine.startswith(('aarch64', 'alpha', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')): + if p <= 33: + return 16 + else: diff --git a/dev-python/numpy/numpy-1.26.1.ebuild b/dev-python/numpy/numpy-1.26.1.ebuild index 955652eea0d8..03c05aeaa686 100644 --- a/dev-python/numpy/numpy-1.26.1.ebuild +++ b/dev-python/numpy/numpy-1.26.1.ebuild @@ -49,6 +49,7 @@ BDEPEND=" >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] ) " +PATCHES=( "${FILESDIR}/${PN}-1.26.1-alpha.patch" ) EPYTEST_XDIST=1 distutils_enable_tests pytest @@ -142,6 +143,13 @@ python_test() { ;; esac + if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then + # depends on importing numpy.random from system namespace + EPYTEST_DESELECT+=( + 'random/tests/test_extending.py::test_cython' + ) + fi + rm -rf numpy || die epytest --pyargs numpy }