From 756bfa715f339dfaa651765bf64e16305d851e1a Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 8 Nov 2023 08:15:20 +0000 Subject: Adding metadata --- dev-python/numpy/files/numpy-1.26.1-alpha.patch | 25 +++++++++++++++++++++++++ dev-python/numpy/numpy-1.26.1.ebuild | 14 +++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 dev-python/numpy/files/numpy-1.26.1-alpha.patch (limited to 'dev-python/numpy') 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 65de4ad13e9a..0e84c8eb1f3b 100644 --- a/dev-python/numpy/numpy-1.26.1.ebuild +++ b/dev-python/numpy/numpy-1.26.1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 ) PYTHON_REQ_USE="threads(+)" FORTRAN_NEEDED=lapack -inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs +inherit distutils-r1 flag-o-matic fortran-2 pypi toolchain-funcs DESCRIPTION="Fast array and numerical python library" HOMEPAGE=" @@ -46,11 +46,12 @@ BDEPEND=" ' 'python*') dev-python/charset-normalizer[${PYTHON_USEDEP}] >=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] ) " +PATCHES=( "${FILESDIR}/${PN}-1.26.1-alpha.patch" ) +EPYTEST_XDIST=1 distutils_enable_tests pytest python_prepare_all() { @@ -142,8 +143,15 @@ 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 -n "$(makeopts_jobs)" --pyargs numpy + epytest --pyargs numpy } python_install_all() { -- cgit v1.3.1