diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-11-07 22:21:54 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-07 22:21:54 +0000 |
| commit | 06dcf64674a43718324bffee383625d2cd050b75 (patch) | |
| tree | 4de58e857f3f0718fef4fc386e42577c2f4c9478 /dev-python/numpy | |
| parent | 198bd0cd3c1be97f7deb5283fa00048718482de4 (diff) | |
gentoo auto-resync : 07:11:2023 - 22:21:54
Diffstat (limited to 'dev-python/numpy')
| -rw-r--r-- | dev-python/numpy/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/numpy/files/numpy-1.26.1-alpha.patch | 25 | ||||
| -rw-r--r-- | dev-python/numpy/numpy-1.26.1.ebuild | 8 |
3 files changed, 35 insertions, 1 deletions
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 29b4af75def2..64041c9eafaa 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -1,3 +1,4 @@ +AUX numpy-1.26.1-alpha.patch 973 BLAKE2B 5ee4565f83c37f5f1c9f3ad26b8616c93c5d047ad8094753b3ed1309699ea4802d2269ebcf0f74525d934c594fb84d3c52f0eed0bcfa3a44f8b5009bffd535e2 SHA512 f8b0faf3b3e40eccbc1656c6969d7b6e665acd7f6f339c96cbf7edb7ad66f4e52a946599dde09d4f8effb6e9f4e66e94f6e59dead9c2bb837ec61037edc6c179 DIST numpy-1.26.1.tar.gz 15651806 BLAKE2B 2b7fe13675b6f11b8f19c2dc671c84418fa959f403ff32c15ae6da37ae8137d062bb47db0180031c90f54451d69d640ec4ebfad0a4eefb32afc55df45c6824ab SHA512 abe5919029fc66961e8f44fdd503b54c291ce75b0d95e3f8bb61ee39a25d62142fbece5734fd7e9cbf65511f9d746fa61796f0d68e6dc2816c0e7747e286e505 -EBUILD numpy-1.26.1.ebuild 4214 BLAKE2B 6f9617f96d2f0465e12a4f278bda8702c5cec04f4e7e4bbca8ef47552319eb33e9ad8e13df110ff0399941542ce00b6fd224e2027c2b8a13be6f3ec605ea0e16 SHA512 5d59385e557203f76f9928ce094e619fd08f3bc73280d43d31800bfd4177a6d86da75dcb302bfaa2366df0d1bba252fa5c84c703d1092de0b7da14a3fb7b0d78 +EBUILD numpy-1.26.1.ebuild 4471 BLAKE2B 900282bba5847bbccbd4270cfde289a43609a307b5d053dc1f63d5442b77686a20dfaab848ed026dc5de9a336f40791e13ca50f628fe8158fd452ebb0edb7ea1 SHA512 7021a76d13871c80b01792d214fe9d7ba087ec7b05088fb79f6dd3e3e11679d952695be8f7be057517ffccec22f05ffd341ae1971dff56b5e4c843b0b2a666ac MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06 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 <matoro@users.noreply.github.com> +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 } |