[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Michał Górny]

commit: 777e9637fee75a3196b82c7c6c45c6433de22241
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jul 22 00:51:32 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jul 22 01:20:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=777e9637

dev-python/numpy: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/numpy/Manifest  |   1 -
 dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch |  23 
 dev-python/numpy/numpy-2.0.0_rc2-r1.ebuild | 127 -
 3 files changed, 151 deletions(-)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 0e5f535e1a09..a03c8536ddc2 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,3 +1,2 @@
 DIST numpy-1.26.4.tar.gz 15786129 BLAKE2B 
ee759d3a857111bc494d5e989a7b005375d942b2a89cda69be4a3bd7c6cb195003fd2a8a0535f1858d8977ff688b0ec36360dcba9c3160206eedce5e28f191ef
 SHA512 
f7121ab4099fa0686f9c095d456baa4a5869d651d7b7a06385f885f329cf08f11024b5df5e7b4ee705970062a8102ec4f709512eabbfd5c9fccce4ef83b9c208
 DIST numpy-2.0.0.tar.gz 18326228 BLAKE2B 
e3d1084b79e0e55cd9087bb34dc116e6c9d6ab14a416a07f727b9f5d5a9db236ecf74a53b7e758d078781c5e565e5557912962f2ddbfff7251ec5b231fabe01d
 SHA512 
cd5612ce2db4be87afa8479c508c256c9ff7f1b15a6b010eb06ba962759cc26552b512ec82711680bab1ebedeb06dfc8d7bff9cec63c94efacaadd719448b287
-DIST numpy-2.0.0rc2.tar.gz 18323588 BLAKE2B 
e2d5d03594d0cba360d4e85207818d15a0761f37cc3fb366f8f9f8bdd97743fe0cf0d09a34319c8b6af29b2bc1fc32a7f5be30a5fa2bdebffe455baff05caf7e
 SHA512 
f86b27264c5274823aa11cbedf17c08f81f9acd05430bf40cccbbe8dcff523410629795ca5927d7f8e6c152272b274d777b64f547d23f50d11ae9fd656fd773d

diff --git a/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch 
b/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch
deleted file mode 100644
index f3ed3727520d..
--- a/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f3bc38235bf39a630035920e29f2f883cae5fffe Mon Sep 17 00:00:00 2001
-From: Matti Picus 
-Date: Sun, 26 May 2024 11:25:43 +0300
-Subject: [PATCH 1/3] BUG: cast missing in PyPy-specific f2py code
-

- numpy/f2py/cb_rules.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py
-index 721e075b6c73..faf8dd401301 100644
 a/numpy/f2py/cb_rules.py
-+++ b/numpy/f2py/cb_rules.py
-@@ -122,7 +122,7 @@
- #setdims#
- #ifdef PYPY_VERSION
- #define CAPI_ARGLIST_SETITEM(idx, value) PyList_SetItem((PyObject 
*)capi_arglist_list, idx, value)
--capi_arglist_list = PySequence_List(capi_arglist);
-+capi_arglist_list = PySequence_List((PyObject *)capi_arglist);
- if (capi_arglist_list == NULL) goto capi_fail;
- #else
- #define CAPI_ARGLIST_SETITEM(idx, value) PyTuple_SetItem((PyObject 
*)capi_arglist, idx, value)
-

diff --git a/dev-python/numpy/numpy-2.0.0_rc2-r1.ebuild 
b/dev-python/numpy/numpy-2.0.0_rc2-r1.ebuild
deleted file mode 100644
index d33733489b22..
--- a/dev-python/numpy/numpy-2.0.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,127 +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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
-# +lapack because the internal fallbacks are pretty slow. Building without blas
-# is barely supported anyway, see bug #914358.
-IUSE="+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}]
-   )
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-   local PATCHES=(
-   # https://github.com/numpy/numpy/pull/26534
-   "${FILESDIR}/${P}-gcc14.patch"
-   )
-
-   # 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=(

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Michał Górny]

commit: cab362d71396a6f4b451962ac310a408f4d2e14d
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 22 04:05:12 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 22 04:05:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab362d7

dev-python/numpy: Backport segfault fix to 1.26.0_beta1

Signed-off-by: Michał Górny  gentoo.org>

 .../files/numpy-1.26.0_beta1-npy_cast_info.patch   |  44 ++
 dev-python/numpy/numpy-1.26.0_beta1-r1.ebuild  | 154 +
 2 files changed, 198 insertions(+)

diff --git a/dev-python/numpy/files/numpy-1.26.0_beta1-npy_cast_info.patch 
b/dev-python/numpy/files/numpy-1.26.0_beta1-npy_cast_info.patch
new file mode 100644
index ..cd09573deb7f
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.26.0_beta1-npy_cast_info.patch
@@ -0,0 +1,44 @@
+From 9cfb416aad45260e1cc837029638d6b39cea9e38 Mon Sep 17 00:00:00 2001
+From: Nathan Goldbaum 
+Date: Mon, 21 Aug 2023 15:45:11 -0600
+Subject: [PATCH] BUG: fix NPY_cast_info error handling in choose
+
+---
+ numpy/core/src/multiarray/item_selection.c | 2 +-
+ numpy/core/tests/test_multiarray.py| 6 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/numpy/core/src/multiarray/item_selection.c 
b/numpy/core/src/multiarray/item_selection.c
+index e935a27edb6..c1d4a950815 100644
+--- a/numpy/core/src/multiarray/item_selection.c
 b/numpy/core/src/multiarray/item_selection.c
+@@ -968,6 +968,7 @@ PyArray_Choose(PyArrayObject *ip, PyObject *op, 
PyArrayObject *out,
+ PyArrayObject **mps, *ap;
+ PyArrayMultiIterObject *multi = NULL;
+ npy_intp mi;
++NPY_cast_info cast_info = {.func = NULL};
+ ap = NULL;
+ 
+ /*
+@@ -1045,7 +1046,6 @@ PyArray_Choose(PyArrayObject *ip, PyObject *op, 
PyArrayObject *out,
+ npy_intp transfer_strides[2] = {elsize, elsize};
+ npy_intp one = 1;
+ NPY_ARRAYMETHOD_FLAGS transfer_flags = 0;
+-NPY_cast_info cast_info = {.func = NULL};
+ if (PyDataType_REFCHK(dtype)) {
+ int is_aligned = IsUintAligned(obj);
+ PyArray_GetDTypeTransferFunction(
+diff --git a/numpy/core/tests/test_multiarray.py 
b/numpy/core/tests/test_multiarray.py
+index 966b75cc122..2836c8985c9 100644
+--- a/numpy/core/tests/test_multiarray.py
 b/numpy/core/tests/test_multiarray.py
+@@ -10043,3 +10043,9 @@ def test_gh_22683():
+ np.choose(np.zeros(1, dtype=int), [a], out=a)
+ refc_end = sys.getrefcount(b)
+ assert refc_end - refc_start < 10
++
++
++def test_gh_24459():
++a = np.zeros((50, 3), dtype=np.float64)
++with pytest.raises(TypeError):
++np.choose(a, [3, -1])

diff --git a/dev-python/numpy/numpy-1.26.0_beta1-r1.ebuild 
b/dev-python/numpy/numpy-1.26.0_beta1-r1.ebuild
new file mode 100644
index ..1072d42ba823
--- /dev/null
+++ b/dev-python/numpy/numpy-1.26.0_beta1-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2023 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..12} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi 
toolchain-funcs
+
+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"
+IUSE="lapack"
+if [[ ${PV} != *_[rab]* ]] ; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+fi
+
+RDEPEND="
+   lapack? (
+   >=virtual/cblas-3.8
+   >=virtual/lapack-3.8
+   )
+"
+BDEPEND="
+   ${RDEPEND}
+   >=dev-util/meson-1.1.0
+   >=dev-python/cython-3.0.0[${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/pytest-xdist[${PYTHON_USEDEP}]
+   >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   local PATCHES=(
+   # https://github.com/numpy/numpy/pull/24484
+   "${FILESDIR}/${P}-npy_cast_info.patch"
+   )
+
+   append-flags -fno-strict-aliasing
+
+   distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+   DISTUTILS_ARGS=(
+   -Dblas=$(usev lapack cblas)
+   -Dlapack=$(usev lapack lapack)
+   # TODO: cpu-* options
+   )
+}
+
+python_test() {
+   local EPYTEST_DESELECT=(
+   # Very disk-and-memory-hungry
+   lib/tests/test_io.py::TestSaveTxt::test_large_zip
+   lib/

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Sam James]

commit: ed65e92b6991f1ae2e4bc6f6064cdb6e3e527452
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug  1 06:48:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  1 06:48:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed65e92b

dev-python/numpy: drop 1.24.3, 1.25.0-r2

Signed-off-by: Sam James  gentoo.org>

 dev-python/numpy/Manifest  |   1 -
 .../files/numpy-1.25.0-fix-long-double-check.patch | 151 --
 dev-python/numpy/numpy-1.24.3.ebuild   | 175 -
 dev-python/numpy/numpy-1.25.0-r2.ebuild| 148 -
 4 files changed, 475 deletions(-)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 6166c42d838a..42faf69137c6 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,7 +2,6 @@ DIST numpy-1.24.0.tar.gz 10897101 BLAKE2B 
59e2b913f90de76589d8fbb2f07e2d389012c7
 DIST numpy-1.24.2.tar.gz 10906862 BLAKE2B 
e48f65eab709f0c57ec378d813a7b65bcaca6d5960b559d6db1c60726e5cf12517f4b2e1636b0ff815a2109925edccba200270db5170fd0aff5fd635919165ac
 SHA512 
145fd7fb3919a185f75076d51b92c54a7fb1b776b637752ca15fdee15b239d6a517ef1bb8cded7c92e059cf6cda0146c24943c042d19b791e81125bc0ad4b820
 DIST numpy-1.24.3.tar.gz 10909904 BLAKE2B 
3b14f8b6a7bd484de43c3b0e57f161388d6226e05ed9bc3d1edfaafc713b9597c7574b9b9c20b4e3a6bd291d32a607d95c72d6e25fa346ffdaf97c94767bc315
 SHA512 
d4b5841cbe68ee6653f99018e4e0182f2e5519a1cd69c14e0a95aa180f878e6a6786ccf0a7c78bf0d511c53e7535d7144fee428572dec7a4b60b25c8a1c0c9e1
 DIST numpy-1.24.4.tar.gz 10911229 BLAKE2B 
2f054b4ede249653707c3df8ccf6df31b747c0625891ae6e01134f84b02d1300e1d7a88b5741e0e0f05218673d95374f263e5bfddbf17c9510aa93bac002eafc
 SHA512 
89eb90548ad4f38cfe0a5077eef426058eed08ca17633024887e4d0ff5bdfe98736b1ad6850fe643bc0035d55ac4cd39b5971895eea9dcf247b5ff186654ed68
-DIST numpy-1.25.0.tar.gz 10426700 BLAKE2B 
9a6c9b7e1172a21ec7cc3b2a0b292308ed7a859072ba73cac3c472cd60f45acd66032f24df19bddef8aa0aee7a243e21d3fa04b68f1383efc6af834cdc04b589
 SHA512 
e464d82bba0487f520ec7a820492343af5172e807e0f746688bbaff636a31947da62704ef0f35c74a46fb42332f4644f3c497d544789d22e5c01ca0823f82909
 DIST numpy-1.25.1.tar.gz 10428993 BLAKE2B 
ee3edaf5416ac858b995f0cb8df75962af01619969a2c70fa10b4e0d0a1c96a3b441ee470a463cdb7c60910d8823af1c41d37933f87bcaa0a724655d052ed20a
 SHA512 
69cc5426f657a21a6a1fb3bb043b8acec90b87969f90177abb6d7294ca96d04f723ddf90fa40822704b16147a390abafbcda9702e40405ea6b6e22377aade71d
 DIST numpy-1.25.2-patches.tar.xz 7212 BLAKE2B 
718331b2d9f8380df239bf2ad9c24d79924e08797825d7c8655124a55e059790f96641633cdb42c597646764ca9efcaf277d5f5b75f042f533c28f2a81d5a5a8
 SHA512 
bcc0c55710b8d874e1dd9a57fad5698e09e3c96254922db32a8beeae9a5a54532cb0660d3ce43ca68e70fa7227bca9e0d12a0298aa6972ad2cbcecfe4aee3e85
 DIST numpy-1.25.2.tar.gz 10805282 BLAKE2B 
f138eaf237f3e8052cafbe9fc98b4b62fb0748079df8599fc0950624c856294157410a2ec6fe381eaa8386b1530a39f7037ae1887c9fcfe2e77a3d7ad1ca0171
 SHA512 
6846d558c227329b6e700965ffa4c7886a7ca5f35234a56d734bc8201d19f7ac87d8ea081094bca13685130dce7bfb98ee4aa3a9dbd538288f10f1d9d82fb699

diff --git a/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch 
b/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch
deleted file mode 100644
index 4f3ef21c93b3..
--- a/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-https://github.com/numpy/numpy/commit/de0b2d5c6dee9303c4a055e7591978ed5a06e403
-
-From de0b2d5c6dee9303c4a055e7591978ed5a06e403 Mon Sep 17 00:00:00 2001
-From: matoro 
-Date: Sun, 18 Jun 2023 19:39:06 -0400
-Subject: [PATCH] BLD: Port long double identification to C for meson
-
-This ports the old Python code for identifying the long double
-representation to C, so that it can be easily invoked by meson.  The
-original implementation is at 
https://github.com/numpy/numpy/blob/eead09a3d02c09374942cdc787c0b5e4fe9e7472/numpy/core/setup_common.py#L264-L434
-
-The C portion of the code has been tested and confirmed to work on
-systems with the following formats, either natively or via an
-alternative ABI:  INTEL_EXTENDED_16_BYTES_LE, IEEE_QUAD_BE,
-IEEE_QUAD_LE, IBM_DOUBLE_DOUBLE_BE, IBM_DOUBLE_DOUBLE_LE,
-IEEE_DOUBLE_BE, INTEL_EXTENDED_12_BYTES_LE.
-
-The original meson port includes an error condition with the comment
-"This should not be possible, 12 bits of "content" should still result
-in sizeof() being 16."  As far as I can tell this is incorrect, as
-compiling on an x86_64 system with 32-bit ABI (gcc -m32) does indeed
-have sizeof(long double)==12.  This is reflected in the C code.
-
-Closes gh-23972, closes
-https://github.com/mesonbuild/meson/issues/11068.

- numpy/core/meson.build | 110 -
- 1 file changed, 87 insertions(+), 23 deletions(-)
-
-diff --git a/numpy/core/meson.build b/numpy/core/meson.build
-index 3427de408f1..92b393e4bc1 100644
 a/numpy/core/meson.build
-+

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Sam James]

commit: bda70e66142a13cf3d2a41c80354a10c6b623dee
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 23 21:43:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 23 21:43:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda70e66

dev-python/numpy: fix type confusion in scalartypes

And skip another f2py test as well for big endian.

Closes: https://bugs.gentoo.org/910739
Signed-off-by: Sam James  gentoo.org>

 .../numpy/files/numpy-1.25.1-fix-scalartypes.patch |  36 +
 dev-python/numpy/numpy-1.25.1-r2.ebuild| 148 +
 2 files changed, 184 insertions(+)

diff --git a/dev-python/numpy/files/numpy-1.25.1-fix-scalartypes.patch 
b/dev-python/numpy/files/numpy-1.25.1-fix-scalartypes.patch
new file mode 100644
index ..845b41fef23a
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.25.1-fix-scalartypes.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/910739
+https://github.com/numpy/numpy/issues/24239
+https://github.com/numpy/numpy/pull/24240
+
+From f5eb12cafc99bb33dad6535dacab2f592aafb2b0 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sun, 23 Jul 2023 21:31:08 +0100
+Subject: [PATCH] BUG: Fix C types in scalartypes
+
+https://github.com/numpy/numpy/pull/23746 introduced a fast path for scalar
+int conversions, but the map between Python types and C types was subtly
+wrong.
+
+This fixes tests on at least ppc32 (big-endian).
+
+Many thanks to Sebastian Berg for debugging this with me and pointing out
+what needed to be fixed.
+
+Closes #24239.
+
+Fixes: 81caed6e3c34c4bf4b22b4f6167e816ba2a3f73c
+--- a/numpy/core/src/multiarray/scalartypes.c.src
 b/numpy/core/src/multiarray/scalartypes.c.src
+@@ -301,10 +301,10 @@ genint_type_str(PyObject *self)
+ item = PyLong_FromUnsignedLong(*(uint32_t *)val);
+ break;
+ case NPY_LONG:
+-item = PyLong_FromLong(*(int64_t *)val);
++item = PyLong_FromLong(*(long *)val);
+ break;
+ case NPY_ULONG:
+-item = PyLong_FromUnsignedLong(*(uint64_t *)val);
++item = PyLong_FromUnsignedLong(*(unsigned long *)val);
+ break;
+ case NPY_LONGLONG:
+ item = PyLong_FromLongLong(*(long long *)val);

diff --git a/dev-python/numpy/numpy-1.25.1-r2.ebuild 
b/dev-python/numpy/numpy-1.25.1-r2.ebuild
new file mode 100644
index ..e369cd1aeb13
--- /dev/null
+++ b/dev-python/numpy/numpy-1.25.1-r2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2023 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..12} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi 
toolchain-funcs
+
+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"
+IUSE="lapack"
+if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~s390 ~sparc 
~x86"
+fi
+
+RDEPEND="
+   lapack? (
+   >=virtual/cblas-3.8
+   >=virtual/lapack-3.8
+   )
+"
+BDEPEND="
+   ${RDEPEND}
+   >=dev-util/meson-1.1.0
+   >=dev-python/cython-0.29.30[${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/pytest-xdist[${PYTHON_USEDEP}]
+   >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.25.0_rc1-meson-pyproject.toml.patch
+   "${FILESDIR}"/${PN}-1.25.0-skip-python3.12-irrelevant-tests.patch
+   "${FILESDIR}"/${PN}-1.25.1-fix-scalartypes.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   append-flags -fno-strict-aliasing
+
+   distutils-r1_python_prepare_all
+
+   # TODO: Please drop once 1.25.0_rc1-meson-pyproject.toml.patch is gone
+   sed -i -e "s:version = \"2.0.0.dev0\":version = \"${PV}\":" 
pyproject.toml || die
+}
+
+python_configure_all() {
+   DISTUTILS_ARGS=(
+   -Dblas=$(usev lapack cblas)
+   -Dlapack=$(usev lapack lapack)
+   )
+}
+
+python_test() {
+   local EPYTEST_DESELECT=(
+   # very disk-and-memory-hungry
+   lib/tests/test_io.py::test_large_zip
+
+   # precision problems
+   
core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+   # runs the whole test suite recursively, that's just crazy
+   core/tests/test_mem_policy.

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Sam James]

commit: 598a530efd89c78a4a079895e362b1db6a4cf54d
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 26 12:48:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 26 13:14:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598a530e

dev-python/numpy: enable py3.12

It turns out the test failures were non-issues and are now fixed upstream.

Closes: https://bugs.gentoo.org/907309
Signed-off-by: Sam James  gentoo.org>

 ...y-1.25.0-skip-python3.12-irrelevant-tests.patch | 187 +
 dev-python/numpy/numpy-1.25.0.ebuild   |   3 +-
 2 files changed, 189 insertions(+), 1 deletion(-)

diff --git 
a/dev-python/numpy/files/numpy-1.25.0-skip-python3.12-irrelevant-tests.patch 
b/dev-python/numpy/files/numpy-1.25.0-skip-python3.12-irrelevant-tests.patch
new file mode 100644
index ..cd829c5ef08e
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.25.0-skip-python3.12-irrelevant-tests.patch
@@ -0,0 +1,187 @@
+https://github.com/numpy/numpy/commit/515403f2c637cb58f8dc326d88dd6f768f027cf4
+https://github.com/numpy/numpy/commit/b0872b858e2e6ebc394e95c81a024dcf1573c690
+https://github.com/numpy/numpy/commit/e42fc93b54a6d41dab72d86921f96e5ebc4c4198
+https://github.com/numpy/numpy/commit/4552b6cb0083502f731794e961cd30b9b62ba2e3
+
+From 515403f2c637cb58f8dc326d88dd6f768f027cf4 Mon Sep 17 00:00:00 2001
+From: Ralf Gommers 
+Date: Sun, 18 Jun 2023 15:56:23 +0200
+Subject: [PATCH] TST: disable `test_new_policy` test for memory allocator.
+
+This is way too slow, running a large part of the test suite twice.
+Issue 23975 tracks changing how this feature is tested.
+---
+ numpy/core/tests/test_mem_policy.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numpy/core/tests/test_mem_policy.py 
b/numpy/core/tests/test_mem_policy.py
+index b4e2f65916c..0855d60771a 100644
+--- a/numpy/core/tests/test_mem_policy.py
 b/numpy/core/tests/test_mem_policy.py
+@@ -359,7 +359,7 @@ def test_thread_locality(get_module):
+ assert np.core.multiarray.get_handler_name() == orig_policy_name
+ 
+ 
+-@pytest.mark.slow
++@pytest.mark.skip(reason="too slow, see gh-23975")
+ def test_new_policy(get_module):
+ a = np.arange(10)
+ orig_policy_name = np.core.multiarray.get_handler_name(a)
+
+From b0872b858e2e6ebc394e95c81a024dcf1573c690 Mon Sep 17 00:00:00 2001
+From: Ralf Gommers 
+Date: Mon, 19 Jun 2023 11:07:19 +0200
+Subject: [PATCH] TST: skip refcount related tests on py312
+
+Python 3.12 has immortal refcounts; the initial and final
+values will be the same when accessing `sys.getrefcount` inside a
+test.
+
+Closes gh-23986
+--- a/numpy/core/tests/test_dtype.py
 b/numpy/core/tests/test_dtype.py
+@@ -755,6 +755,11 @@ def iter_struct_object_dtypes():
+ yield pytest.param(dt, p, 12, obj, id="")
+ 
+ 
++@pytest.mark.skipif(
++sys.version_info >= (3, 12),
++reason="Python 3.12 has immortal refcounts, this test will no longer "
++   "work. See gh-23986"
++)
+ @pytest.mark.skipif(not HAS_REFCOUNT, reason="Python lacks refcounts")
+ class TestStructuredObjectRefcounting:
+ """These tests cover various uses of complicated structured types which
+--- a/numpy/core/tests/test_regression.py
 b/numpy/core/tests/test_regression.py
+@@ -1465,6 +1465,10 @@ def test_structured_arrays_with_objects1(self):
+ x[x.nonzero()] = x.ravel()[:1]
+ assert_(x[0, 1] == x[0, 0])
+ 
++@pytest.mark.skipif(
++sys.version_info >= (3, 12),
++reason="Python 3.12 has immortal refcounts, this test no longer 
works."
++)
+ @pytest.mark.skipif(not HAS_REFCOUNT, reason="Python lacks refcounts")
+ def test_structured_arrays_with_objects2(self):
+ # Ticket #1299 second test
+
+From e42fc93b54a6d41dab72d86921f96e5ebc4c4198 Mon Sep 17 00:00:00 2001
+From: Ralf Gommers 
+Date: Mon, 19 Jun 2023 11:14:38 +0200
+Subject: [PATCH] TST: skip memory allocator and `array_interface` tests on
+ py312
+
+They require numpy.distutils, which isn't available on >=3.12
+The `numpy.testing.extbuild` utility will need changing to make this
+work again. Could either use plain `setuptools` or `meson`.
+--- a/numpy/core/tests/test_array_interface.py
 b/numpy/core/tests/test_array_interface.py
+@@ -128,6 +128,9 @@ def get_module(tmp_path):
+more_init=more_init)
+ 
+ 
++# FIXME: numpy.testing.extbuild uses `numpy.distutils`, so this won't work on
++# Python 3.12 and up.
++@pytest.mark.skipif(sys.version_info >= (3, 12), reason="no numpy.distutils")
+ @pytest.mark.slow
+ def test_cstruct(get_module):
+ 
+--- a/numpy/core/tests/test_mem_policy.py
 b/numpy/core/tests/test_mem_policy.py
+@@ -9,6 +9,11 @@
+ import sys
+ 
+ 
++# FIXME: numpy.testing.extbuild uses `numpy.distutils`, so this won't work on
++# Python 3.12 and up. It's an internal test utility, so for now we just skip
++# these tests.
++
++
+ @pytest.fixture
+ def get_module(tmp_path):
+ """

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Michał Górny]

commit: b03a954e49c70a63146c5774217a28dcef15566d
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Dec  3 17:00:27 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Dec  3 17:00:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03a954e

dev-python/numpy: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/numpy/Manifest   |   8 -
 dev-python/numpy/files/numpy-1.22.4-py311.patch |  31 
 dev-python/numpy/numpy-1.22.4.ebuild| 184 ---
 dev-python/numpy/numpy-1.23.3.ebuild| 187 
 4 files changed, 410 deletions(-)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 4ff26f7aa647..55360bf2f6a1 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,16 +1,8 @@
-DIST numpy-1.22.4.zip 11458830 BLAKE2B 
c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364
 SHA512 
bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
-DIST numpy-1.23.3.tar.gz 10726039 BLAKE2B 
4b6d38fc0363ea89f173a0cd65368b7c154b45f7f661098378f7ef31208008d5ff17ae58eab72bed921d166d630a4eca3441fc3097cd41a4a945b8f8180375cc
 SHA512 
e690ea2906c91e567df2c801fbfe41652dabd37208faa99d6e068bda423dcc9f88be013478e9b6c1a339c36ef4c44b07a067d44e4e9c4b2e4f1344cbcb0598a9
 DIST numpy-1.23.4.tar.gz 10728765 BLAKE2B 
bbac44cc8a09a36537e25f90833c2ad7d1e4025e7d3eebd3c73ae2f12f1109520b58d2a779324f542aa1f2787f8b6c50ea907eb5ab7b7b84ebe3f3342c3d8a09
 SHA512 
727ca8950b0fbd5670e939b1c9c5cea852781ec4254d56a1659a91dc0430fc10b01ffdd16e1bb28a62319f91029e087024f4c6298bfc859a6050bfb507edcff8
 DIST numpy-1.23.5.tar.gz 10731755 BLAKE2B 
d2ed6d359a51343a1618f64604e4d5c030115caa63f2aadf2fc150775630e40fbebaad28f5657faae1365264fd45bc9efb00854bf9cd393b7628c96d6fc87db9
 SHA512 
8f3ece76dbe79bc887275332d25f851ade2087de3026de5fb7ed793590b3e7d274f590357296e152373b4e9a245d4d563393ba7198bca6d44631b941acb89c2c
-DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 
44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a
 SHA512 
4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
-DIST numpy-html-1.23.3.zip 27964271 BLAKE2B 
0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44
 SHA512 
218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.4.zip 27964271 BLAKE2B 
0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44
 SHA512 
218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.5.zip 27964271 BLAKE2B 
0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44
 SHA512 
218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
-DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 
702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da
 SHA512 
c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
-DIST numpy-ref-1.23.3.pdf 7715485 BLAKE2B 
7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba
 SHA512 
6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.4.pdf 7715485 BLAKE2B 
7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba
 SHA512 
6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.5.pdf 7715485 BLAKE2B 
7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba
 SHA512 
6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
-DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 
87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95
 SHA512 
8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
-DIST numpy-user-1.23.3.pdf 4123384 BLAKE2B 
d4587c9f979e1ef4734768598d6e106f2b4b0c822

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Sam James]

commit: 9f61e7e9d7602a858a9d7cbc4e24ba0db5b7813c
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 25 07:48:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 25 08:20:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f61e7e9

dev-python/numpy: drop 1.23.1

Signed-off-by: Sam James  gentoo.org>

 dev-python/numpy/Manifest  |   4 -
 .../files/numpy-1.21.0-no-hardcode-blasv2.patch|  53 --
 .../numpy-1.21.4-build-compiler-args-ceph.patch|  49 --
 dev-python/numpy/numpy-1.23.1.ebuild   | 192 -
 4 files changed, 298 deletions(-)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index e0dd1e830a96..becb2629a429 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,16 +1,12 @@
 DIST numpy-1.22.4.zip 11458830 BLAKE2B 
c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364
 SHA512 
bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
-DIST numpy-1.23.1.tar.gz 10716841 BLAKE2B 
c8b17bc6f1626a32fd62ac3e952f6ee4a5886ba9ab9721be540831d3cdb19c4ea7cefcb422b12384fd4804d12f6f4b0d8f1e0110306e426a2b92d5f98acd62f7
 SHA512 
b34fb627e0e548bae3cf4555c4c71ab4a170ade86a9ff4011a5dfac6aba29e2e04b1151b9364cd1efff004efc1c04b3bab111facbcdc3297f8c38d7a09c83e17
 DIST numpy-1.23.3.tar.gz 10726039 BLAKE2B 
4b6d38fc0363ea89f173a0cd65368b7c154b45f7f661098378f7ef31208008d5ff17ae58eab72bed921d166d630a4eca3441fc3097cd41a4a945b8f8180375cc
 SHA512 
e690ea2906c91e567df2c801fbfe41652dabd37208faa99d6e068bda423dcc9f88be013478e9b6c1a339c36ef4c44b07a067d44e4e9c4b2e4f1344cbcb0598a9
 DIST numpy-1.23.4.tar.gz 10728765 BLAKE2B 
bbac44cc8a09a36537e25f90833c2ad7d1e4025e7d3eebd3c73ae2f12f1109520b58d2a779324f542aa1f2787f8b6c50ea907eb5ab7b7b84ebe3f3342c3d8a09
 SHA512 
727ca8950b0fbd5670e939b1c9c5cea852781ec4254d56a1659a91dc0430fc10b01ffdd16e1bb28a62319f91029e087024f4c6298bfc859a6050bfb507edcff8
 DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 
44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a
 SHA512 
4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
-DIST numpy-html-1.23.1.zip 27964271 BLAKE2B 
0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44
 SHA512 
218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.3.zip 27964271 BLAKE2B 
0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44
 SHA512 
218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.4.zip 27964271 BLAKE2B 
0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44
 SHA512 
218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 
702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da
 SHA512 
c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
-DIST numpy-ref-1.23.1.pdf 7715485 BLAKE2B 
7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba
 SHA512 
6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.3.pdf 7715485 BLAKE2B 
7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba
 SHA512 
6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.4.pdf 7715485 BLAKE2B 
7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba
 SHA512 
6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 
87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95
 SHA512 
8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
-DIST numpy-user-1.23.1.pdf 4123384 BLAKE2B 
d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Michał Górny]

commit: 5cdbc6cf673b0e8c1434a881eca2ab499908f26b
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Oct  8 13:48:10 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct  8 13:48:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cdbc6cf

dev-python/numpy: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/numpy/Manifest  |  24 ---
 ...umpy-1.22.1-revert-setuptools-upper-bound.patch |  22 ---
 dev-python/numpy/numpy-1.22.0-r1.ebuild| 162 -
 dev-python/numpy/numpy-1.22.1.ebuild   | 167 --
 dev-python/numpy/numpy-1.22.2.ebuild   | 170 --
 dev-python/numpy/numpy-1.22.3.ebuild   | 178 ---
 dev-python/numpy/numpy-1.23.0.ebuild   | 192 -
 dev-python/numpy/numpy-1.23.2.ebuild   | 187 
 8 files changed, 1102 deletions(-)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index cc9a6554141e..1b9dc66baad4 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,40 +1,16 @@
 DIST numpy-1.21.5.zip 10652289 BLAKE2B 
c5bded91e5d06670ea3ace51560411c61985dd89ff0455b833838320f1714cf788a21a60aefd7a0ff30ad0abb93c9d296f60e637944000efa090b6c259c1f47c
 SHA512 
03affa9d0bbf42a8d35f5454f1527df28539e306dc2b313fa775625201a5fe9eb7376f443bba5d50e08567546708811beb7201819eeb2af5a0653b7d91249f78
-DIST numpy-1.22.0.zip 11291139 BLAKE2B 
91cd2188aaa59d7be18761b74865295f400e309e34bf79067493221c5f0eb875a5c726dd8e322db84fa9714800347954b6a9896aadf914e87872497f7e65527c
 SHA512 
dcea1a6cd257f6353caccc30b2adb1cf2e9d52191ec9f968839c85b1f776ebf8c5ac8bbf0751c2c6f292ae671e4006d26eb06691ca1504e4d65baf4cec3f9803
-DIST numpy-1.22.1.zip 11443674 BLAKE2B 
3f2e5fbd449c078fd97670be14e87fd9bccc8418dc37f87199557642f0f951f5fd21b89eff938c30171eda3174c526db91e470e9e9cdc297b8abd9b4fe364ad5
 SHA512 
0d8b5ffb6f8377b3d6d6cb62fd7eef083f8a3b787542b7887e0d214c6fa78b63b6f726302bca554c0c11c57e4611926c8d8ff4abf5dd59842b8b58086391434d
-DIST numpy-1.22.2.zip 11447735 BLAKE2B 
43dee4d06139822b1eec8280591ddbf6629bc8b92c5c279bf2c5e2f5b0afb4c30c2af2e783002a836280dc6affb60f51a49a37821dcf647563aa19b77aa489c8
 SHA512 
4ad584527d4395404c2d5d8fe5eb1aae1defac39361a987bdaa4d1f133c03fdc32c3d554c0edb544b55946f46fb3121c98526ebc1ee06e174087c727bf9b88d7
-DIST numpy-1.22.3.zip 11451867 BLAKE2B 
0212cf2882410f9d9083fe40b3630733d0e407cab32c7aa10affc138e6305fdcba119a7a2d1b6c3dd5b99765d9204afa5ac8e389369ca933e779e5a647271605
 SHA512 
fdeefd0ffad798a078376fe16ad840551309d3bbf551eca09d92a35048ee75c3739ab0becedb23448d82999da148827e69ded8842201c3dda72b46b4eb9be93f
 DIST numpy-1.22.4.zip 11458830 BLAKE2B 
c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364
 SHA512 
bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
-DIST numpy-1.23.0.tar.gz 10714532 BLAKE2B 
8b7784adfe4aba8a21a50b460b908cd20eede912f46cc6840a65c03f4f128123ead64e61768ff839a6a79797680a5189ff39284be5819bacb6eb7e1902a09656
 SHA512 
899d0ca062b676b64de0da204339694dcb7e52f257625e971f9a8ad7267206a6ad2924353e4dd1e153b4a64ae318380899c9e1ee7a6f53fdeba4c19b34917583
 DIST numpy-1.23.1.tar.gz 10716841 BLAKE2B 
c8b17bc6f1626a32fd62ac3e952f6ee4a5886ba9ab9721be540831d3cdb19c4ea7cefcb422b12384fd4804d12f6f4b0d8f1e0110306e426a2b92d5f98acd62f7
 SHA512 
b34fb627e0e548bae3cf4555c4c71ab4a170ade86a9ff4011a5dfac6aba29e2e04b1151b9364cd1efff004efc1c04b3bab111facbcdc3297f8c38d7a09c83e17
-DIST numpy-1.23.2.tar.gz 10719306 BLAKE2B 
d9f41d34331a3b5690e0bd4eedf050c31e088e1d6b01af6fed7e2bacc281ba7587975c5fda690c8b8f392ddef1a2ab2b6a18f6098d55876485eae58d36f98212
 SHA512 
ac5ed21887d41c94d395bfee2bb5492453b375344e43a9944224dac2eb13c6ad7477aa7a626d032d27b1c610e269232998ecc77a327da887748e794bf28c3feb
 DIST numpy-1.23.3.tar.gz 10726039 BLAKE2B 
4b6d38fc0363ea89f173a0cd65368b7c154b45f7f661098378f7ef31208008d5ff17ae58eab72bed921d166d630a4eca3441fc3097cd41a4a945b8f8180375cc
 SHA512 
e690ea2906c91e567df2c801fbfe41652dabd37208faa99d6e068bda423dcc9f88be013478e9b6c1a339c36ef4c44b07a067d44e4e9c4b2e4f1344cbcb0598a9
-DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.5.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
-DIST numpy-html-1.22.1.zip 23724824 BLAKE2B 
44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e2

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Sam James]

commit: 4060d4e419a67622448089fce86ba256ce3338ef
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 31 22:47:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 31 22:48:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4060d4e4

dev-python/numpy: add 1.22.0

Signed-off-by: Sam James  gentoo.org>

 dev-python/numpy/Manifest  |   4 +
 .../files/numpy-1.22.0-no-hardcode-blasv2.patch|  78 ++
 dev-python/numpy/numpy-1.22.0.ebuild   | 162 +
 3 files changed, 244 insertions(+)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 9daedd30ee92..993f73add007 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -3,16 +3,20 @@ DIST numpy-1.21.2.zip 10264801 BLAKE2B 
2d88506faa5bc767a16c000f201559917d800fd20
 DIST numpy-1.21.3.zip 10269351 BLAKE2B 
60fc96d91e2c4e0b1c6ee409e02640686fe257f5addbb17229568f591551ea3c415c4aac97b7cdb161b88ce436e42a766b161bd5a82f8cb66fff6771c0097bd3
 SHA512 
8fbe4e8543b72ad5203d5b122eb3d875e48965682945898e54f4ce82cf790713dfd9185b8b12439aefa86bf25209ea25d04ec3ca2aa2b8d2f32d69358421b792
 DIST numpy-1.21.4.zip 10646392 BLAKE2B 
6e2953c6ca8e35c99f5de5faaacfb2b76b351a5c9521ba27449fcdeca5614978ff7d71fc52ce3787d1c7506c4e8eb81b1a92d3bf6825de1cb1d304ea4de83820
 SHA512 
85575a009bf40a8e5acaaa949d2669545968825df34273e367c42af36fa882ebb0830ff7953b5617d34d3061b3877238524937c42470fac9464479dc33ae60ce
 DIST numpy-1.21.5.zip 10652289 BLAKE2B 
c5bded91e5d06670ea3ace51560411c61985dd89ff0455b833838320f1714cf788a21a60aefd7a0ff30ad0abb93c9d296f60e637944000efa090b6c259c1f47c
 SHA512 
03affa9d0bbf42a8d35f5454f1527df28539e306dc2b313fa775625201a5fe9eb7376f443bba5d50e08567546708811beb7201819eeb2af5a0653b7d91249f78
+DIST numpy-1.22.0.zip 11291139 BLAKE2B 
91cd2188aaa59d7be18761b74865295f400e309e34bf79067493221c5f0eb875a5c726dd8e322db84fa9714800347954b6a9896aadf914e87872497f7e65527c
 SHA512 
dcea1a6cd257f6353caccc30b2adb1cf2e9d52191ec9f968839c85b1f776ebf8c5ac8bbf0751c2c6f292ae671e4006d26eb06691ca1504e4d65baf4cec3f9803
+DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.1.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.2.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.3.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.4.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.5.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
+DIST numpy-ref-1.21.0.pdf 7326979 BLAKE2B 
3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182
 SHA512 
5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.1.pdf 7326979 BLAKE2B 
3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182
 SHA512 
5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.2.pdf 7326979 BLAKE2B 
3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182
 SHA512 
5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.3.pdf 7326979 BLAKE2B 
3c1130a576c46e0705ca1f12e7a3345beb1acdd2

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Michał Górny]

commit: a0809fc6c528672ee4eb88221bdf38d5cc3def16
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Sep  8 05:58:23 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Sep  8 05:58:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0809fc6

dev-python/numpy: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/numpy/Manifest  |  12 --
 .../files/numpy-1.20.1-no-hardcode-blasv2.patch|  50 ---
 .../files/numpy-1.20.2-fix-ccompiler-tests.patch   |  36 --
 .../files/numpy-1.20.2-fix-popcnt-detection.patch  | 103 ---
 .../files/numpy-1.20.3-float-hashing-py310.patch   | 129 --
 dev-python/numpy/numpy-1.20.2-r1.ebuild| 144 -
 dev-python/numpy/numpy-1.20.3-r1.ebuild| 142 
 dev-python/numpy/numpy-1.21.0.ebuild   | 139 
 8 files changed, 755 deletions(-)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 0c0ed744521..fbe95681182 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,20 +1,8 @@
-DIST numpy-1.20.2.zip 7756879 BLAKE2B 
8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e
 SHA512 
337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
-DIST numpy-1.20.3.zip 7761912 BLAKE2B 
a4da49f7c1aadca299acb1b6d92deb4f50b1881c4b131cd389524a88ffc70179b2acdc88235dccd1ffd09879893db45b16bf2f54ced9b9639b806e85f7346285
 SHA512 
897be1cd6f3880711149dcedd838357e2d937a3c5f36b2a0db6ceed341654acf96b8b775610e1b43bdb6eacb987bbc51aaa8906244ca02cc8c2eae359ccef405
-DIST numpy-1.21.0.zip 10252686 BLAKE2B 
98f69855fae35f53a3bd467ca9bc0c06438519e6dc84808de829a4b1e41402b764c35ac4f94edba72496693241f85f488d6f91c81e7e5c3e33fdac264ce9ba56
 SHA512 
b4653ed78030d3c411fcafc08c6656072480704379810b7e3a4d907b55c255c27dcef6d519cdc0bb2dc79324c475baf0263248fb456be18a9ce80e3a2c5c7120
 DIST numpy-1.21.1.zip 10259878 BLAKE2B 
ba5d8eb2d294e199c86d8e96026d148098f5716398e730e0fdfee3b710fd01cb6e877973471d7751a2e558c2eaeb626fe9ce5ea4b03a7e4f8e5dc42b852d5b7c
 SHA512 
694100915f4e2917d70a83e7fcdad30c85ffad8f5ad8d164c89287846c1b746c2b577233bacf53e8d8ca5147391f46065a2cabf100957bb8841dee4a042bc1f5
 DIST numpy-1.21.2.zip 10264801 BLAKE2B 
2d88506faa5bc767a16c000f201559917d800fd205c75f30c1e61d4b34e214b376da9876e96186914f9fe23bf033a305bf9212f593841407e3bf4e516b5982a6
 SHA512 
ad08110d9a73a73ef1a546de5fcd6dfe600c17b396f629c3a19ade7b3f226688cf7524fed78c035fd4ddda135e2bcf9facb5e061fb59640b424da2ed070c4184
-DIST numpy-html-1.16.4.zip 12097069 BLAKE2B 
db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5
 SHA512 
c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
-DIST numpy-html-1.20.3.zip 22936526 BLAKE2B 
9c0bf4edea0c34640a2f2d84f117aa383f8690f5c99eb9c504aa27c07195c1e5a4219efc798398d8de709803b67d4a41a2739b1319b6dd7aeba3e70e817c2488
 SHA512 
181ff49fcde40f2d260e480d4a90bd8b439aecafef4ea581749b5a432c7e8c163b1714a97fd447c512b550d5bf3d9b104c575b4939eb5c8b7b70bbce1153982a
-DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.1.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.2.zip 24270531 BLAKE2B 
8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89
 SHA512 
a165b95729a13806a03464cf39c20a0e18cfcf7701f05cdcd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
-DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 
9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564
 SHA512 
983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
-DIST numpy-ref-1.20.3.pdf 7362241 BLAKE2B 
bf17564d7aea0db25ca9ef6b24dbbd25093c09e2a93bb60b69220d4e666024c50f3373fdb65aac510c06420dc415102d552fb0435e1986330ffdc41e9e356098
 SHA512 
316e645402125ca41d1e8b4da33374703f4379c31cf572c8ad429e0e89b6968776f480f9159bce53b9fdec918f03b82e5bb6446f127f43f138d6c0990191af5a
-DIST numpy-ref-1.21.0.pdf 7326979 BLAKE2B 
3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Sam James]

commit: ca58a4b159282f564f046e035a17f7ce0bd30f01
Author: Sam James  gentoo  org>
AuthorDate: Mon May 24 22:08:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 24 22:08:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca58a4b1

dev-python/numpy: add popcnt patch

Closes: https://bugs.gentoo.org/788184
Signed-off-by: Sam James  gentoo.org>

 .../files/numpy-1.20.2-fix-popcnt-detection.patch  | 103 +
 ...{numpy-1.20.2.ebuild => numpy-1.20.2-r1.ebuild} |   1 +
 dev-python/numpy/numpy-1.20.3.ebuild   |   1 +
 3 files changed, 105 insertions(+)

diff --git a/dev-python/numpy/files/numpy-1.20.2-fix-popcnt-detection.patch 
b/dev-python/numpy/files/numpy-1.20.2-fix-popcnt-detection.patch
new file mode 100644
index 000..85f4bb11b76
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.20.2-fix-popcnt-detection.patch
@@ -0,0 +1,103 @@
+https://github.com/numpy/numpy/pull/19074
+https://bugs.gentoo.org/788184
+
+From 8dc768964b5578a8aa9db1ef2c55134a00731e10 Mon Sep 17 00:00:00 2001
+From: Carl Michal 
+Date: Sat, 22 May 2021 20:43:10 -0700
+Subject: [PATCH 1/2] Fix compile-time test of POPCNT
+
+The compile-time test of POPCNT, cpu_popcnt.c produced code that would
+execute without error even if the machine didn't support the popcnt
+instruction. This patch attempts to use popcnt on random numbers so the
+compiler can't substitute the answer at compile time.
+---
+ numpy/distutils/checks/cpu_popcnt.c | 14 ++
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/numpy/distutils/checks/cpu_popcnt.c 
b/numpy/distutils/checks/cpu_popcnt.c
+index e6a80fb40be4..f6c785dd2a97 100644
+--- a/numpy/distutils/checks/cpu_popcnt.c
 b/numpy/distutils/checks/cpu_popcnt.c
+@@ -4,20 +4,26 @@
+ #include 
+ #endif
+ 
++#include 
++
+ int main(void)
+ {
+ long long a = 0;
+ int b;
++
++a = random();
++b = random();
++  
+ #ifdef _MSC_VER
+ #ifdef _M_X64
+-a = _mm_popcnt_u64(1);
++a = _mm_popcnt_u64(a);
+ #endif
+-b = _mm_popcnt_u32(1);
++b = _mm_popcnt_u32(b);
+ #else
+ #ifdef __x86_64__
+-a = __builtin_popcountll(1);
++a = __builtin_popcountll(a);
+ #endif
+-b = __builtin_popcount(1);
++b = __builtin_popcount(b);
+ #endif
+ return (int)a + b;
+ }
+
+From 52d5fe1ede45083d0783c3e2bbaee5c44df9d553 Mon Sep 17 00:00:00 2001
+From: Carl Michal 
+Date: Sun, 23 May 2021 08:24:52 -0700
+Subject: [PATCH 2/2] Change fix of cpu_popcnt.c to use
+ _mm_popcnt_u64/_mm_popcnt_u32 on GCC
+
+_builtin_popcount is always available, so the compile-time check always
+succeeds.
+---
+ numpy/distutils/checks/cpu_popcnt.c | 26 --
+ 1 file changed, 8 insertions(+), 18 deletions(-)
+
+diff --git a/numpy/distutils/checks/cpu_popcnt.c 
b/numpy/distutils/checks/cpu_popcnt.c
+index f6c785dd2a97..540c98dab05d 100644
+--- a/numpy/distutils/checks/cpu_popcnt.c
 b/numpy/distutils/checks/cpu_popcnt.c
+@@ -4,26 +4,16 @@
+ #include 
+ #endif
+ 
+-#include 
+-
+-int main(void)
++int main(int argc, char **argv)
+ {
+-long long a = 0;
+-int b;
+-
+-a = random();
+-b = random();
+-  
+-#ifdef _MSC_VER
+-#ifdef _M_X64
++// To make sure popcnt instructions are generated
++// and been tested against the assembler
++unsigned long long a = *((unsigned long long*)argv[argc-1]);
++unsigned int b = *((unsigned int*)argv[argc-2]);
++
++#if defined(_M_X64) || defined(__x86_64__)
+ a = _mm_popcnt_u64(a);
+-#endif
+-b = _mm_popcnt_u32(b);
+-#else
+-#ifdef __x86_64__
+-a = __builtin_popcountll(a);
+-#endif
+-b = __builtin_popcount(b);
+ #endif
++b = _mm_popcnt_u32(b);
+ return (int)a + b;
+ }

diff --git a/dev-python/numpy/numpy-1.20.2.ebuild 
b/dev-python/numpy/numpy-1.20.2-r1.ebuild
similarity index 98%
rename from dev-python/numpy/numpy-1.20.2.ebuild
rename to dev-python/numpy/numpy-1.20.2-r1.ebuild
index 234a0932bb9..2e16936ea19 100644
--- a/dev-python/numpy/numpy-1.20.2.ebuild
+++ b/dev-python/numpy/numpy-1.20.2-r1.ebuild
@@ -48,6 +48,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/numpy-1.20.1-no-hardcode-blasv2.patch
"${FILESDIR}"/numpy-1.20.2-fix-ccompiler-tests.patch
+   "${FILESDIR}"/numpy-1.20.2-fix-popcnt-detection.patch
 )
 
 distutils_enable_tests pytest

diff --git a/dev-python/numpy/numpy-1.20.3.ebuild 
b/dev-python/numpy/numpy-1.20.3.ebuild
index 5b772a58a6f..6604eb23a4e 100644
--- a/dev-python/numpy/numpy-1.20.3.ebuild
+++ b/dev-python/numpy/numpy-1.20.3.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/numpy-1.20.1-no-hardcode-blasv2.patch
"${FILESDIR}"/numpy-1.20.2-fix-ccompiler-tests.patch
+   "${FILESDIR}"/numpy-1.20.2-fix-popcnt-detection.patch
"${FILESDIR}"/numpy-1.20.3-float-hashing-py310.patch
 )
 

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Marek Szuba]

commit: 8901b5e61974c1e6df76de1cd86b72f417ee4221
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri May 14 21:22:11 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri May 14 21:39:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8901b5e6

dev-python/numpy: support python3_10

Needed one commit to be backported from master. Now it builds, tests and
installs fine.

Signed-off-by: Marek Szuba  gentoo.org>

 .../files/numpy-1.20.3-float-hashing-py310.patch   | 129 +
 dev-python/numpy/numpy-1.20.3.ebuild   |   3 +-
 2 files changed, 131 insertions(+), 1 deletion(-)

diff --git a/dev-python/numpy/files/numpy-1.20.3-float-hashing-py310.patch 
b/dev-python/numpy/files/numpy-1.20.3-float-hashing-py310.patch
new file mode 100644
index 000..f3b2ea3ef0c
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.20.3-float-hashing-py310.patch
@@ -0,0 +1,129 @@
+From ad2a73c18dcff95d844c382c94ab7f73b5571cf3 Mon Sep 17 00:00:00 2001
+From: Sebastian Berg 
+Date: Tue, 4 May 2021 17:43:26 -0500
+Subject: [PATCH] MAINT: Adjust NumPy float hashing to Python's slightly
+ changed hash
+
+This is necessary, since we use the Python double hash and the
+semi-private function to calculate it in Python has a new signature
+to return the identity-hash when the value is NaN.
+
+closes gh-18833, gh-18907
+---
+ numpy/core/src/common/npy_pycompat.h| 16 ++
+ numpy/core/src/multiarray/scalartypes.c.src | 13 
+ numpy/core/tests/test_scalarmath.py | 34 +
+ 3 files changed, 57 insertions(+), 6 deletions(-)
+
+diff --git a/numpy/core/src/common/npy_pycompat.h 
b/numpy/core/src/common/npy_pycompat.h
+index aa0b5c1224d..9e94a971090 100644
+--- a/numpy/core/src/common/npy_pycompat.h
 b/numpy/core/src/common/npy_pycompat.h
+@@ -3,4 +3,20 @@
+ 
+ #include "numpy/npy_3kcompat.h"
+ 
++
++/*
++ * In Python 3.10a7 (or b1), python started using the identity for the hash
++ * when a value is NaN.  See https://bugs.python.org/issue43475
++ */
++#if PY_VERSION_HEX > 0x030a00a6
++#define Npy_HashDouble _Py_HashDouble
++#else
++static NPY_INLINE Py_hash_t
++Npy_HashDouble(PyObject *NPY_UNUSED(identity), double val)
++{
++return _Py_HashDouble(val);
++}
++#endif
++
++
+ #endif /* _NPY_COMPAT_H_ */
+diff --git a/numpy/core/src/multiarray/scalartypes.c.src 
b/numpy/core/src/multiarray/scalartypes.c.src
+index a001500b0a9..9930f7791d6 100644
+--- a/numpy/core/src/multiarray/scalartypes.c.src
 b/numpy/core/src/multiarray/scalartypes.c.src
+@@ -3172,7 +3172,7 @@ static npy_hash_t
+ static npy_hash_t
+ @lname@_arrtype_hash(PyObject *obj)
+ {
+-return _Py_HashDouble((double) PyArrayScalar_VAL(obj, @name@));
++return Npy_HashDouble(obj, (double)PyArrayScalar_VAL(obj, @name@));
+ }
+ 
+ /* borrowed from complex_hash */
+@@ -3180,14 +3180,14 @@ static npy_hash_t
+ c@lname@_arrtype_hash(PyObject *obj)
+ {
+ npy_hash_t hashreal, hashimag, combined;
+-hashreal = _Py_HashDouble((double)
+-PyArrayScalar_VAL(obj, C@name@).real);
++hashreal = Npy_HashDouble(
++obj, (double)PyArrayScalar_VAL(obj, C@name@).real);
+ 
+ if (hashreal == -1) {
+ return -1;
+ }
+-hashimag = _Py_HashDouble((double)
+-PyArrayScalar_VAL(obj, C@name@).imag);
++hashimag = Npy_HashDouble(
++obj, (double)PyArrayScalar_VAL(obj, C@name@).imag);
+ if (hashimag == -1) {
+ return -1;
+ }
+@@ -3202,7 +3202,8 @@ c@lname@_arrtype_hash(PyObject *obj)
+ static npy_hash_t
+ half_arrtype_hash(PyObject *obj)
+ {
+-return _Py_HashDouble(npy_half_to_double(PyArrayScalar_VAL(obj, Half)));
++return Npy_HashDouble(
++obj, npy_half_to_double(PyArrayScalar_VAL(obj, Half)));
+ }
+ 
+ static npy_hash_t
+diff --git a/numpy/core/tests/test_scalarmath.py 
b/numpy/core/tests/test_scalarmath.py
+index d91b4a39146..09a734284a7 100644
+--- a/numpy/core/tests/test_scalarmath.py
 b/numpy/core/tests/test_scalarmath.py
+@@ -712,6 +712,40 @@ def test_shift_all_bits(self, type_code, op):
+ assert_equal(res_arr, res_scl)
+ 
+ 
++class TestHash:
++@pytest.mark.parametrize("type_code", np.typecodes['AllInteger'])
++def test_integer_hashes(self, type_code):
++scalar = np.dtype(type_code).type
++for i in range(128):
++assert hash(i) == hash(scalar(i))
++
++@pytest.mark.parametrize("type_code", np.typecodes['AllFloat'])
++def test_float_and_complex_hashes(self, type_code):
++scalar = np.dtype(type_code).type
++for val in [np.pi, np.inf, 3, 6.]:
++numpy_val = scalar(val)
++# Cast back to Python, in case the NumPy scalar has less precision
++if numpy_val.dtype.kind == 'c':
++val = complex(numpy_val)
++else:
++val = float(numpy_val)
++assert val == numpy_val
++print(repr(numpy_val), repr(val))
++ 

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Michał Górny]

commit: 0dc86ae6c53ec5511808e636b958a3a130145838
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Apr 30 17:05:42 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Apr 30 20:25:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc86ae6

dev-python/numpy: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/numpy/Manifest  |   1 -
 .../files/numpy-1.17.4-no-hardcode-blasv2.patch|  47 ---
 dev-python/numpy/numpy-1.19.5.ebuild   | 145 -
 3 files changed, 193 deletions(-)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 2be41f6e7d9..42d7b76c750 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,4 +1,3 @@
-DIST numpy-1.19.5.zip 7318340 BLAKE2B 
a01fd07d8cbfc53c1585b19701f9052fd4b1b4010d24c61e1054352a80343e6644ae6e61ce7565fd9c7c99b9e1174bdd2e685fd540d08b1ec9919f86cc8e
 SHA512 
dfe2809b5f486624b4802ea5610822bf7ba80c46dcf8505f69b0267137b01719131f74aa366949954c66796d48ba1b4f74cf0ecc5692a9ebd49e673fb0881ff4
 DIST numpy-1.20.2.zip 7756879 BLAKE2B 
8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e
 SHA512 
337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B 
db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5
 SHA512 
c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 
9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564
 SHA512 
983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09

diff --git a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch 
b/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch
deleted file mode 100644
index 850f70f4551..000
--- a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index ba2b1f46c..09db18e69 100644
 a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -374,28 +374,7 @@ def get_info(name, notfound_action=0):
-   1 - display warning message
-   2 - raise error
- """
--cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--  'atlas_threads': atlas_threads_info,# ditto
--  'atlas_blas': atlas_blas_info,
--  'atlas_blas_threads': atlas_blas_threads_info,
--  'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--  'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--  'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--  'atlas_3_10_threads': atlas_3_10_threads_info,# 
ditto
--  'atlas_3_10_blas': atlas_3_10_blas_info,
--  'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--  'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt 
instead
--  'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # 
ditto
--  'flame': flame_info,  # use lapack_opt instead
--  'mkl': mkl_info,
--  # openblas which may or may not have embedded lapack
--  'openblas': openblas_info,  # use blas_opt instead
--  # openblas with embedded lapack
--  'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--  'openblas_clapack': openblas_clapack_info, # use blas_opt instead
--  'blis': blis_info,  # use blas_opt instead
--  'lapack_mkl': lapack_mkl_info,  # use lapack_opt instead
--  'blas_mkl': blas_mkl_info,  # use blas_opt instead
-+cl = {'flame': flame_info,  # use lapack_opt instead
-   'accelerate': accelerate_info,  # use blas_opt instead
-   'x11': x11_info,
-   'fft_opt': fft_opt_info,
-@@ -796,10 +775,7 @@ class system_info(object):
- return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
- def get_libraries(self, key='libraries'):
--if hasattr(self, '_lib_names'):
--return self.get_libs(key, default=self._lib_names)
--else:
--return self.get_libs(key, '')
-+return self.get_libs(key, '')
- 
- def library_extensions(self):
- c = customized_ccompiler()
- 

diff --git a/dev-python/numpy/numpy-1.19.5.ebuild 
b/dev-python/numpy/numpy-1.19.5.ebuild
deleted file mode 100644
index 181526f95b2..000
--- a/dev-python/numpy/numpy-1.19.5.ebuild
+++ /dev/null
@@ 

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Michał Górny]

commit: 75b4217280c7bdc1c4d538579400e325100c0bd5
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Mar 28 06:52:53 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Mar 28 09:48:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b42172

dev-python/numpy: Bump to 1.20.2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/numpy/Manifest  |   1 +
 .../files/numpy-1.20.2-fix-ccompiler-tests.patch   |  36 ++
 dev-python/numpy/numpy-1.20.2.ebuild   | 143 +
 3 files changed, 180 insertions(+)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index bd68d750b4a..e7a65c515c5 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,5 +1,6 @@
 DIST numpy-1.19.5.zip 7318340 BLAKE2B 
a01fd07d8cbfc53c1585b19701f9052fd4b1b4010d24c61e1054352a80343e6644ae6e61ce7565fd9c7c99b9e1174bdd2e685fd540d08b1ec9919f86cc8e
 SHA512 
dfe2809b5f486624b4802ea5610822bf7ba80c46dcf8505f69b0267137b01719131f74aa366949954c66796d48ba1b4f74cf0ecc5692a9ebd49e673fb0881ff4
 DIST numpy-1.20.1.zip 7750776 BLAKE2B 
0f3915f2e8dfa6e0e7a6251fcba5365379d91b448101513860573f07e1f3fa24b097177a333230d7cbea1f58afed1718346d0348d14344544fe063e4baa6786a
 SHA512 
edd1be2df27940f050ebd8eeb7b053b9987849d3b4aa0cb3c75d2fe2318f358e1b37f3bafedc772c224021e9316ebce45e1b75aa0e35d248f8ba9a9112b57b86
+DIST numpy-1.20.2.zip 7756879 BLAKE2B 
8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e
 SHA512 
337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B 
db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5
 SHA512 
c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 
9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564
 SHA512 
983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B 
da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9
 SHA512 
3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6

diff --git a/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch 
b/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch
new file mode 100644
index 000..2312dd89a9b
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch
@@ -0,0 +1,36 @@
+From 6f2f26e08c6e0d476593c82ad31d13847f30cbf4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+Date: Sun, 28 Mar 2021 10:00:14 +0200
+Subject: [PATCH] BUG: Fix test_ccompiler_opt when path contains dots
+
+Fix test_ccompiler_opt not to be confused by dots occurring on the path
+to the temporary directory, by using only the source file's basename
+when grabbing options.  Otherwise, the test can fail with mismatches
+such as:
+
+E   AssertionError: 'sources_status' returns different targets 
than the compiled targets
+E   ['AVX512F', 'AVX2'] != ['(20 2/TEMP/TMPB0YHSCAI/TEST_TARGETS 
AVX512F)', '(20 2/TEMP/TMPB0YHSCAI/TEST_TARGETS AVX2)']
+
+This is because our TMPDIR value includes numpy version, i.e. 1.20.2.
+The splitting happens on the first dot that is part of the directory
+path rather than test filename.
+---
+ numpy/distutils/tests/test_ccompiler_opt.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numpy/distutils/tests/test_ccompiler_opt.py 
b/numpy/distutils/tests/test_ccompiler_opt.py
+index 287a683c8..d2b0a4c58 100644
+--- a/numpy/distutils/tests/test_ccompiler_opt.py
 b/numpy/distutils/tests/test_ccompiler_opt.py
+@@ -112,7 +112,7 @@ class _Test_CCompilerOpt(object):
+ gflags = {}
+ fake_objects = opt.try_dispatch([file])
+ for source, flags in fake_objects:
+-gtar = source.split('.')[1:-1]
++gtar = path.basename(source).split('.')[1:-1]
+ glen = len(gtar)
+ if glen == 0:
+ gtar = "baseline"
+-- 
+2.31.1
+

diff --git a/dev-python/numpy/numpy-1.20.2.ebuild 
b/dev-python/numpy/numpy-1.20.2.ebuild
new file mode 100644
index 000..43fe8721f7e
--- /dev/null
+++ b/dev-python/numpy/numpy-1.20.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lap

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Michał Górny]

commit: 73587b0581ba0e2209399e08c30fdc015d5cf299
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Sep 16 10:10:15 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Sep 16 10:13:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73587b05

dev-python/numpy: Remove old (finally!)

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/numpy/Manifest  |   2 -
 .../files/numpy-1.15.4-no-hardcode-blas.patch  |  76 --
 ...-1.16.5-setup.py-install-skip-build-fails.patch |  23 ---
 dev-python/numpy/numpy-1.16.5-r1.ebuild| 159 -
 dev-python/numpy/numpy-1.17.4-r3.ebuild| 137 --
 5 files changed, 397 deletions(-)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index de57d6601e0..67d4a3a8e30 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,5 +1,3 @@
-DIST numpy-1.16.5.zip 5138208 BLAKE2B 
f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437
 SHA512 
6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
-DIST numpy-1.17.4.zip 6366657 BLAKE2B 
89f729bb0740fa721dfe8d1165094a96302fde1e8c272689c11cb4a9bb39d11afaf6eda3ded8a370333b47b9d1ee25e8cb0a602c8cf44964612342c50ea5824f
 SHA512 
f3264be7152437d71718da4728222962013ebd7fe02288d5063f1c763d1c4eee26485c27e8088f4dff79a4d491bc9f191849748c6007d093d22e89c6bff317f3
 DIST numpy-1.19.0.zip 7296082 BLAKE2B 
e388a1b8aa8fa5e23b57c69c5aa5f2b7b286a69fca6007843adbfa374d541ace7875757a302e851bc41194f565390b52777fff13da8166e7a2c6b0a0f3efd29c
 SHA512 
24f8847ff6b72dd44db197fbd80596677f9f3c5afcc87f30c41a4c0a2ccd4ee652ca630a537997ba8fe68c4919fa488e9d8cadd9a310e5356b017f6086055850
 DIST numpy-1.19.1.zip 7301568 BLAKE2B 
f7c17666d8cd4f477d7946be383d2ff1656c412e23dc49c55f94a6fcb95a6cffe6b4958169b1b27e027a7d674feb96de979d8bba4f1e3d9daef9b72e7f48cafa
 SHA512 
ddc5f5e262d6f7f6e1a8879165860427baa237b6aad5b09d5b943a36bb0d5922424aac4c0e32a2cc3e14087bf6eb671988b6ff6df0d9ab8c89724e093220eead
 DIST numpy-1.19.2.zip 7310530 BLAKE2B 
a019c64809bd61071a4dd5e10c2cdf6927f392ebe58b45a08529295079bca68a683502aba89847578e122271d2fa4ea6d2d5461f1e58322f550cda863d36125b
 SHA512 
56ae348f08818e30b6675df7d41a2b03687af452d7a96356fccfce2994843c7b61918946381c3af25fe03f209413d0378ee691fc38d805491a12c464e49bb59c

diff --git a/dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch 
b/dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch
deleted file mode 100644
index 979b56bd6dc..000
--- a/dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index 65d7de316..a85640d30 100644
 a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -364,29 +364,7 @@ def get_info(name, notfound_action=0):
-   1 - display warning message
-   2 - raise error
- """
--cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--  'atlas_threads': atlas_threads_info,# ditto
--  'atlas_blas': atlas_blas_info,
--  'atlas_blas_threads': atlas_blas_threads_info,
--  'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--  'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--  'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--  'atlas_3_10_threads': atlas_3_10_threads_info,# 
ditto
--  'atlas_3_10_blas': atlas_3_10_blas_info,
--  'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--  'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt 
instead
--  'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # 
ditto
--  'mkl': mkl_info,
--  # openblas which may or may not have embedded lapack
--  'openblas': openblas_info,  # use blas_opt instead
--  # openblas with embedded lapack
--  'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--  'openblas_clapack': openblas_clapack_info, # use blas_opt instead
--  'blis': blis_info,  # use blas_opt instead
--  'lapack_mkl': lapack_mkl_info,  # use lapack_opt instead
--  'blas_mkl': blas_mkl_info,  # use blas_opt instead
--  'accelerate': accelerate_info,  # use blas_opt instead
--  'x11': x11_info,
-+cl = {'x11': x11_info,
-   'fft_opt': fft_opt_info,
-   'fftw': fftw_info,
-   'fftw2': fftw2_info,
-@@ -731,10 +709,7 @@ class system_info(object):
- return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
- def get_libraries(self, key='libraries'):
--if hasattr(self, '_lib_names'):
--return self.get_libs(key, default=

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[David Seifert]

commit: 4ca6f412eb725fe077fd6ccc35d08fba782c9421
Author: David Seifert  gentoo  org>
AuthorDate: Wed Feb 26 19:46:21 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Feb 26 19:46:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca6f412

dev-python/numpy: Remove old

Closes: https://github.com/gentoo/gentoo/pull/14780
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 dev-python/numpy/Manifest  |  12 --
 .../files/numpy-1.14.5-no-hardcode-blas.patch  |  75 --
 dev-python/numpy/files/numpy-1.14.5-py37.patch | 135 --
 .../files/numpy-1.17.4-no-hardcode-blas.patch  |  55 
 dev-python/numpy/numpy-1.14.5.ebuild   | 152 -
 dev-python/numpy/numpy-1.15.4.ebuild   | 147 
 dev-python/numpy/numpy-1.16.1.ebuild   | 150 
 7 files changed, 726 deletions(-)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index fc66e4413ae..d2674141d47 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,17 +1,5 @@
-DIST numpy-1.14.5.zip 4904624 BLAKE2B 
14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0
 SHA512 
e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
-DIST numpy-1.15.4.zip 4473522 BLAKE2B 
c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090
 SHA512 
9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
-DIST numpy-1.16.1.zip 5070040 BLAKE2B 
0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e
 SHA512 
e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8
 DIST numpy-1.16.5.zip 5138208 BLAKE2B 
f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437
 SHA512 
6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
 DIST numpy-1.17.4.zip 6366657 BLAKE2B 
89f729bb0740fa721dfe8d1165094a96302fde1e8c272689c11cb4a9bb39d11afaf6eda3ded8a370333b47b9d1ee25e8cb0a602c8cf44964612342c50ea5824f
 SHA512 
f3264be7152437d71718da4728222962013ebd7fe02288d5063f1c763d1c4eee26485c27e8088f4dff79a4d491bc9f191849748c6007d093d22e89c6bff317f3
-DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 
00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370
 SHA512 
578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
-DIST numpy-html-1.15.4.zip 11158615 BLAKE2B 
eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4d7f3f295e02ff5ff90351b0feccf657ce90001
 SHA512 
1cad60013f374f456bbb1fb6161545a94e252205c28054f9b33cde65330772ab243339289517a8825957a21e210455d33bcc0b9c588052c49c88257b1b04facb
-DIST numpy-html-1.16.1.zip 12132467 BLAKE2B 
050a8cba160e36a4c547f1b67b8ab2b9220c9841a9f8343dce6f3221313505530a1687efa2116384a03d3bc9172a0298b4ea5ece2f423841d595e45f565ccbc2
 SHA512 
5af356313363e00f05db560902cc7578162c7d2ab9c1ef0f3713854682b63d76297d55eb9aac0dfc7f4b687ccea93a53462e2082ef1270e29e19680e1222b34d
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B 
db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5
 SHA512 
c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
-DIST numpy-ref-1.14.5.pdf 4855150 BLAKE2B 
aa924542346bd06b1aa8b11ceb8eb5de936cfdccc10a8339720a297e27b5b34961044eb8db8dd7b9a19ba93b3cbf76ec278a9a50724653aafd2b9d57a7f2
 SHA512 
717f58fcb1aa66ecc5f5d4c11c9923d2beb21a1b1a0ca1e46f3622c69f1122fd0547b7f7abaf6de008e2aa988b2453af3c2590877f5596fb6642479ece651746
-DIST numpy-ref-1.15.4.pdf 4843444 BLAKE2B 
26154930a8c881f49e7eb7d9540d1deba27baed1acb15dbacd42a659c05f50605cd44b63b2474e66d1d22851145cc65b3e3f26302f8966e141cbd2afc666c654
 SHA512 
aebff74389e785bd588ccc287329aea4dbc3ef51b46fbffdf088853342fea724f79f712733e453877949e756a52e89de3b257e5feba86e830df84ed8f9bb0e30
-DIST numpy-ref-1.16.1.pdf 5175448 BLAKE2B 
5cd692a0fc825216560dbbf48738a49b794973d4539bd778f0f9a2f7f72b32d3061675f9a76db4cbfbb38eec0793c70046180fcb07e23ffc6177dee76b16bb92
 SHA512 
6cad03e30d7c2204fb899f4e4d1167fefade60d20dedf0ea87ac15c70139fbcca8789cdf17af5a2d221ba06eb78e9376b4b542621f9d78772041c83ab2405d1a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 
9a875ebd1473b241d463d810a6d191581a

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Patrick McLean]

commit: d923ee66e7cca27851fa0b1a7af9031c3233bc70
Author: Patrick McLean  sony  com>
AuthorDate: Wed Nov 20 01:24:00 2019 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Nov 20 01:24:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d923ee66

dev-python/numpy: Version bump to 1.17.4, add python3.8

This also drops python2.7 since upstream no longer supports it.

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean  gentoo.org>

 dev-python/numpy/Manifest  |   1 +
 .../files/numpy-1.17.4-no-hardcode-blas.patch  |  55 
 dev-python/numpy/numpy-1.17.4.ebuild   | 157 +
 3 files changed, 213 insertions(+)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index d1b4c64c85e..972c6ff7b69 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,6 +2,7 @@ DIST numpy-1.14.5.zip 4904624 BLAKE2B 
14d266bf1139b9539e39d08a6537e2b772e80bf46a
 DIST numpy-1.15.4.zip 4473522 BLAKE2B 
c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090
 SHA512 
9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
 DIST numpy-1.16.1.zip 5070040 BLAKE2B 
0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e
 SHA512 
e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8
 DIST numpy-1.16.5.zip 5138208 BLAKE2B 
f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437
 SHA512 
6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
+DIST numpy-1.17.4.zip 6366657 BLAKE2B 
89f729bb0740fa721dfe8d1165094a96302fde1e8c272689c11cb4a9bb39d11afaf6eda3ded8a370333b47b9d1ee25e8cb0a602c8cf44964612342c50ea5824f
 SHA512 
f3264be7152437d71718da4728222962013ebd7fe02288d5063f1c763d1c4eee26485c27e8088f4dff79a4d491bc9f191849748c6007d093d22e89c6bff317f3
 DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 
00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd
 SHA512 
996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
 DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 
00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370
 SHA512 
578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
 DIST numpy-html-1.15.4.zip 11158615 BLAKE2B 
eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4d7f3f295e02ff5ff90351b0feccf657ce90001
 SHA512 
1cad60013f374f456bbb1fb6161545a94e252205c28054f9b33cde65330772ab243339289517a8825957a21e210455d33bcc0b9c588052c49c88257b1b04facb

diff --git a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blas.patch 
b/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blas.patch
new file mode 100644
index 000..8c2a58a1940
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blas.patch
@@ -0,0 +1,55 @@
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index ba2b1f46c..09db18e69 100644
+--- a/numpy/distutils/system_info.py
 b/numpy/distutils/system_info.py
+@@ -374,28 +374,7 @@ def get_info(name, notfound_action=0):
+   1 - display warning message
+   2 - raise error
+ """
+-cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-  'atlas_threads': atlas_threads_info,# ditto
+-  'atlas_blas': atlas_blas_info,
+-  'atlas_blas_threads': atlas_blas_threads_info,
+-  'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-  'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-  'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
+-  'atlas_3_10_threads': atlas_3_10_threads_info,# 
ditto
+-  'atlas_3_10_blas': atlas_3_10_blas_info,
+-  'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+-  'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt 
instead
+-  'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # 
ditto
+-  'flame': flame_info,  # use lapack_opt instead
+-  'mkl': mkl_info,
+-  # openblas which may or may not have embedded lapack
+-  'openblas': openblas_info,  # use blas_opt instead
+-  # openblas with embedded lapack
+-  'openblas_lapack': openblas_lapack_i

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Benda XU]

commit: f5c71a4aa9615c8c14caa8e7076519ab2a4b9824
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Jun 23 12:46:21 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Jun 23 12:47:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c71a4a

dev-python/numpy: fix cblas detection.

  Drop old ebuilds versionator eclass.
  Drop live ebuild.  It has not been taken care of since numpy-1.9.

Suggested-By: Zongyu Zhang  gmail.com>
Closes: https://bugs.gentoo.org/647072
Closes: https://bugs.gentoo.org/688392
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Benda Xu  gentoo.org>

 dev-python/numpy/Manifest  |  16 --
 .../files/numpy-1.10.2-no-hardcode-blas.patch  |  64 
 .../files/numpy-1.12.1-no-hardcode-blas.patch  |  72 -
 .../numpy/files/numpy-1.8.0-no-hardcode-blas.patch |  25 ---
 .../numpy/files/numpy-1.9.2-no-hardcode-blas.patch |  35 -
 dev-python/numpy/numpy-1.10.4.ebuild   | 154 ---
 dev-python/numpy/numpy-1.13.3.ebuild   | 167 -
 dev-python/numpy/numpy-1.14.5.ebuild   |   3 +-
 dev-python/numpy/numpy-1.15.4.ebuild   |   3 +-
 dev-python/numpy/numpy-1.16.1.ebuild   |   3 +-
 dev-python/numpy/numpy-1.8.2.ebuild| 145 --
 dev-python/numpy/numpy-1.9.2.ebuild| 146 --
 dev-python/numpy/numpy-.ebuild | 134 -
 13 files changed, 6 insertions(+), 961 deletions(-)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 990af89ef52..f080e969086 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,28 +1,12 @@
-DIST numpy-1.10.4.tar.gz 4069996 BLAKE2B 
9f315d1fca4415b148d4b3bff6f223930bab3d0cb9e19fc5790d71218549c9f0031355e8a95eae9c866ceaf6391a3aa41206bf3f48477b6cabbbc52e0287c246
 SHA512 
57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79
-DIST numpy-1.13.3.zip 5021189 BLAKE2B 
5a2890a8e08425a2d537667cb2c621a57e1d442951d0b06aee2a9a153bf76652e9c4cbaa11716697a85c580e1f30043d5eef10fc24245074e6431a873ff80c34
 SHA512 
b77969372c8463879b452dc54830afabb719e6814a2bb1ee0062b463155ac709d1cd48839b28b74aacaee8aced7ee35870ba43d59293ff54f90bc0f717ca7737
 DIST numpy-1.14.5.zip 4904624 BLAKE2B 
14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0
 SHA512 
e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
 DIST numpy-1.15.4.zip 4473522 BLAKE2B 
c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090
 SHA512 
9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
 DIST numpy-1.16.1.zip 5070040 BLAKE2B 
0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e
 SHA512 
e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8
-DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 
00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd
 SHA512 
996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
-DIST numpy-1.9.2.tar.gz 3986067 BLAKE2B 
e5ae6717badac01186a5b0f36729c1c01dda1fb4238978858c778f08f17512c5d1f3902d551cb0c67a77c1246ce238e588556188e7e6466c27ebdde09879782d
 SHA512 
70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9
-DIST numpy-html-1.10.1.zip 9663942 BLAKE2B 
436ab4185212f8eeaa3d61e29c2c547c9f24bf0869984cc674e66a7360177e999cc70a6573316711e478db62057d5cee90f85b978d095c6b47f1dc3832ffbdf7
 SHA512 
9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9
-DIST numpy-html-1.13.0.zip 10324817 BLAKE2B 
e16357e615b30249a4c41582b46b194e2c3113996260f0ff60e5b64ce9b344a05a5f372095a9f1187e8474bda4078f41ad8372c801637278d3478176de455eaa
 SHA512 
2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542
 DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 
00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370
 SHA512 
578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
 DIST numpy-html-1.15.4.zip 11158615 BLAKE2B 
eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Virgil Dupras]

commit: 444bd57738ed0a98225a74a5e299ac4c879794cd
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue Jan  8 18:52:58 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Jan  8 18:52:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444bd577

dev-python/numpy: bump to 1.15.4

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-python/numpy/Manifest  |   4 +
 .../files/numpy-1.15.4-no-hardcode-blas.patch  |  76 +++
 dev-python/numpy/numpy-1.15.4.ebuild   | 145 +
 3 files changed, 225 insertions(+)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 802bda40193..64f688658aa 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,20 +1,24 @@
 DIST numpy-1.10.4.tar.gz 4069996 BLAKE2B 
9f315d1fca4415b148d4b3bff6f223930bab3d0cb9e19fc5790d71218549c9f0031355e8a95eae9c866ceaf6391a3aa41206bf3f48477b6cabbbc52e0287c246
 SHA512 
57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79
 DIST numpy-1.13.3.zip 5021189 BLAKE2B 
5a2890a8e08425a2d537667cb2c621a57e1d442951d0b06aee2a9a153bf76652e9c4cbaa11716697a85c580e1f30043d5eef10fc24245074e6431a873ff80c34
 SHA512 
b77969372c8463879b452dc54830afabb719e6814a2bb1ee0062b463155ac709d1cd48839b28b74aacaee8aced7ee35870ba43d59293ff54f90bc0f717ca7737
 DIST numpy-1.14.5.zip 4904624 BLAKE2B 
14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0
 SHA512 
e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
+DIST numpy-1.15.4.zip 4473522 BLAKE2B 
c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090
 SHA512 
9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
 DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 
00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd
 SHA512 
996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
 DIST numpy-1.9.2.tar.gz 3986067 BLAKE2B 
e5ae6717badac01186a5b0f36729c1c01dda1fb4238978858c778f08f17512c5d1f3902d551cb0c67a77c1246ce238e588556188e7e6466c27ebdde09879782d
 SHA512 
70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9
 DIST numpy-html-1.10.1.zip 9663942 BLAKE2B 
436ab4185212f8eeaa3d61e29c2c547c9f24bf0869984cc674e66a7360177e999cc70a6573316711e478db62057d5cee90f85b978d095c6b47f1dc3832ffbdf7
 SHA512 
9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9
 DIST numpy-html-1.13.0.zip 10324817 BLAKE2B 
e16357e615b30249a4c41582b46b194e2c3113996260f0ff60e5b64ce9b344a05a5f372095a9f1187e8474bda4078f41ad8372c801637278d3478176de455eaa
 SHA512 
2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542
 DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 
00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370
 SHA512 
578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
+DIST numpy-html-1.15.4.zip 11158615 BLAKE2B 
eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4d7f3f295e02ff5ff90351b0feccf657ce90001
 SHA512 
1cad60013f374f456bbb1fb6161545a94e252205c28054f9b33cde65330772ab243339289517a8825957a21e210455d33bcc0b9c588052c49c88257b1b04facb
 DIST numpy-html-1.8.1.zip 9703711 BLAKE2B 
1f9d9cb4e65fc2f03d07da9bc34de9c8c4f93f5267689abccb0e2383b23babfed52ae6c3969738e78eeca7b32f49c90f9f7bb92dd432a6b87e082b67c1f214a5
 SHA512 
1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071
 DIST numpy-html-1.9.1.zip 9839137 BLAKE2B 
84b4c15ee20d8a1e6514baf47b96ac770690357278ff22b48c427509534c41df9e14165483f625955a7c6c087b0b5e13e68bf3d06951352a8511d6e03cc65d9f
 SHA512 
647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4
 DIST numpy-ref-1.10.1.pdf 5382006 BLAKE2B 
c360d40c6ac3d2975a760dcf32ed312f30e9ee6b096020e0513bb22af600de62f5f72309603414b3bbcaf02a1aacd79e84545a6e5d50611bfdabafa9f6441a10
 SHA512 
25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c
 DIST numpy-ref-1.13.0.pdf 5047809 BLAKE2B 
c7e2734311918c6faa46b008c4802bb090a728ca22337695755e885a7d7d341ba76d5

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Michał Górny]

commit: 557f548a624556a208aef66a58b7b3cd3760558b
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jul 15 21:38:56 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 15 22:22:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557f548a

dev-python/numpy: Backport a fix for py3.7 test failures

 dev-python/numpy/files/numpy-1.14.5-py37.patch | 135 +
 dev-python/numpy/numpy-1.14.5.ebuild   |   2 +
 2 files changed, 137 insertions(+)

diff --git a/dev-python/numpy/files/numpy-1.14.5-py37.patch 
b/dev-python/numpy/files/numpy-1.14.5-py37.patch
new file mode 100644
index 000..c53b3acf696
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.14.5-py37.patch
@@ -0,0 +1,135 @@
+From dce7f20e95e6bd3fc07517c0b2daf3942a34ddf7 Mon Sep 17 00:00:00 2001
+From: Charles Harris 
+Date: Wed, 14 Mar 2018 12:52:26 -0600
+Subject: [PATCH] MAINT: Fix test_utils.py for Python 3.7.
+
+The contents of the module warnings registries was made more module
+specific in Python 3.7 and consequently the tests of the context
+managers clear_and_catch_warnings and suppress_warnings need updating.
+---
+ numpy/testing/tests/test_utils.py | 43 +--
+ 1 file changed, 29 insertions(+), 14 deletions(-)
+
+diff --git a/numpy/testing/tests/test_utils.py 
b/numpy/testing/tests/test_utils.py
+index a97b627f9..33b3555b0 100644
+--- a/numpy/testing/tests/test_utils.py
 b/numpy/testing/tests/test_utils.py
+@@ -1114,18 +1114,28 @@ class TestStringEqual(unittest.TestCase):
+   lambda: assert_string_equal("foo", "hello"))
+ 
+ 
+-def assert_warn_len_equal(mod, n_in_context, py3_n_in_context=None):
++def assert_warn_len_equal(mod, n_in_context, py34=None, py37=None):
+ mod_warns = mod.__warningregistry__
++num_warns = len(mod_warns)
+ # Python 3.4 appears to clear any pre-existing warnings of the same type,
+ # when raising warnings inside a catch_warnings block. So, there is a
+ # warning generated by the tests within the context manager, but no
+ # previous warnings.
+ if 'version' in mod_warns:
+-if py3_n_in_context is None:
+-py3_n_in_context = n_in_context
+-assert_equal(len(mod_warns) - 1, py3_n_in_context)
+-else:
+-assert_equal(len(mod_warns), n_in_context)
++# Python 3 adds a 'version' entry to the registry,
++# do not count it.
++num_warns -= 1
++
++# Behavior of warnings is Python version dependent. Adjust the
++# expected result to compensate. In particular, Python 3.7 does
++# not make an entry for ignored warnings.
++if sys.version_info[:2] >= (3, 7):
++if py37 is not None:
++n_in_context = py37
++elif sys.version_info[:2] >= (3, 4):
++if py34 is not None:
++n_in_context = py34
++assert_equal(num_warns, n_in_context)
+ 
+ 
+ def _get_fresh_mod():
+@@ -1134,6 +1144,8 @@ def _get_fresh_mod():
+ try:
+ my_mod.__warningregistry__.clear()
+ except AttributeError:
++# will not have a __warningregistry__ unless warning has been
++# raised in the module at some point
+ pass
+ return my_mod
+ 
+@@ -1147,21 +1159,23 @@ def test_clear_and_catch_warnings():
+ warnings.warn('Some warning')
+ assert_equal(my_mod.__warningregistry__, {})
+ # Without specified modules, don't clear warnings during context
++# Python 3.7 catch_warnings doesn't make an entry for 'ignore'.
+ with clear_and_catch_warnings():
+ warnings.simplefilter('ignore')
+ warnings.warn('Some warning')
+-assert_warn_len_equal(my_mod, 1)
++assert_warn_len_equal(my_mod, 1, py37=0)
+ # Confirm that specifying module keeps old warning, does not add new
+ with clear_and_catch_warnings(modules=[my_mod]):
+ warnings.simplefilter('ignore')
+ warnings.warn('Another warning')
+-assert_warn_len_equal(my_mod, 1)
++assert_warn_len_equal(my_mod, 1, py37=0)
+ # Another warning, no module spec does add to warnings dict, except on
+ # Python 3.4 (see comments in `assert_warn_len_equal`)
++# Python 3.7 catch_warnings doesn't make an entry for 'ignore'.
+ with clear_and_catch_warnings():
+ warnings.simplefilter('ignore')
+ warnings.warn('Another warning')
+-assert_warn_len_equal(my_mod, 2, 1)
++assert_warn_len_equal(my_mod, 2, py34=1, py37=0)
+ 
+ 
+ def test_suppress_warnings_module():
+@@ -1178,6 +1192,7 @@ def test_suppress_warnings_module():
+ np.apply_along_axis(warn, 0, [0])
+ 
+ # Test module based warning suppression:
++assert_warn_len_equal(my_mod, 0)
+ with suppress_warnings() as sup:
+ sup.record(UserWarning)
+ # suppress warning from other module (may have .pyc ending),
+@@ -1189,8 +1204,7 @@ def test_suppress_warnings_module():
+ # got filtered)
+ assert_(len(s

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[Michał Górny]

commit: 3c5cc8b7b2996ff2644f3da46508720275bd0529
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jul 14 20:04:08 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jul 14 21:44:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5cc8b7

dev-python/numpy: Bump to 1.14.5

 dev-python/numpy/Manifest  |   4 +
 .../files/numpy-1.14.5-no-hardcode-blas.patch  |  75 +++
 dev-python/numpy/numpy-1.14.5.ebuild   | 146 +
 3 files changed, 225 insertions(+)

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index d608a1d2cd4..802bda40193 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,16 +1,20 @@
 DIST numpy-1.10.4.tar.gz 4069996 BLAKE2B 
9f315d1fca4415b148d4b3bff6f223930bab3d0cb9e19fc5790d71218549c9f0031355e8a95eae9c866ceaf6391a3aa41206bf3f48477b6cabbbc52e0287c246
 SHA512 
57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79
 DIST numpy-1.13.3.zip 5021189 BLAKE2B 
5a2890a8e08425a2d537667cb2c621a57e1d442951d0b06aee2a9a153bf76652e9c4cbaa11716697a85c580e1f30043d5eef10fc24245074e6431a873ff80c34
 SHA512 
b77969372c8463879b452dc54830afabb719e6814a2bb1ee0062b463155ac709d1cd48839b28b74aacaee8aced7ee35870ba43d59293ff54f90bc0f717ca7737
+DIST numpy-1.14.5.zip 4904624 BLAKE2B 
14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0
 SHA512 
e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
 DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 
00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd
 SHA512 
996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
 DIST numpy-1.9.2.tar.gz 3986067 BLAKE2B 
e5ae6717badac01186a5b0f36729c1c01dda1fb4238978858c778f08f17512c5d1f3902d551cb0c67a77c1246ce238e588556188e7e6466c27ebdde09879782d
 SHA512 
70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9
 DIST numpy-html-1.10.1.zip 9663942 BLAKE2B 
436ab4185212f8eeaa3d61e29c2c547c9f24bf0869984cc674e66a7360177e999cc70a6573316711e478db62057d5cee90f85b978d095c6b47f1dc3832ffbdf7
 SHA512 
9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9
 DIST numpy-html-1.13.0.zip 10324817 BLAKE2B 
e16357e615b30249a4c41582b46b194e2c3113996260f0ff60e5b64ce9b344a05a5f372095a9f1187e8474bda4078f41ad8372c801637278d3478176de455eaa
 SHA512 
2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542
+DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 
00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370
 SHA512 
578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
 DIST numpy-html-1.8.1.zip 9703711 BLAKE2B 
1f9d9cb4e65fc2f03d07da9bc34de9c8c4f93f5267689abccb0e2383b23babfed52ae6c3969738e78eeca7b32f49c90f9f7bb92dd432a6b87e082b67c1f214a5
 SHA512 
1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071
 DIST numpy-html-1.9.1.zip 9839137 BLAKE2B 
84b4c15ee20d8a1e6514baf47b96ac770690357278ff22b48c427509534c41df9e14165483f625955a7c6c087b0b5e13e68bf3d06951352a8511d6e03cc65d9f
 SHA512 
647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4
 DIST numpy-ref-1.10.1.pdf 5382006 BLAKE2B 
c360d40c6ac3d2975a760dcf32ed312f30e9ee6b096020e0513bb22af600de62f5f72309603414b3bbcaf02a1aacd79e84545a6e5d50611bfdabafa9f6441a10
 SHA512 
25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c
 DIST numpy-ref-1.13.0.pdf 5047809 BLAKE2B 
c7e2734311918c6faa46b008c4802bb090a728ca22337695755e885a7d7d341ba76d5e489c9c56cf89a9d0545bc9b24787e193c4bc1af2631a368b812fe74083
 SHA512 
0fe28be029602f8b8dc12987da273581b42f123a9d605321084d4c05233cd31ccff0efb17b99c3e8cbfec5f8de11252a99c1ee5c43d37aa5fa57d712f4bb4aca
+DIST numpy-ref-1.14.5.pdf 4855150 BLAKE2B 
aa924542346bd06b1aa8b11ceb8eb5de936cfdccc10a8339720a297e27b5b34961044eb8db8dd7b9a19ba93b3cbf76ec278a9a50724653aafd2b9d57a7f2
 SHA512 
717f58fcb1aa66ecc5f5d4c11c9923d2beb21a1b1a0ca1e46f3622c69f1122fd0547b7f7abaf6de008e2aa988b2453af3c2590877f5596fb6642479ece651746
 DIST numpy-ref-1.8.1.pdf 5348248 BLAKE2B 
f087fbbd3c789adebd2902db0a2acc8a8748ccbb5a1e7e064effdc91e92c7dcf087ae36436fc52d7afa12a12ca2fc0f5f5617177bcd8b9745a7155acd10d71fc
 SHA512 
340dd8f47430f24fea81bb3

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/, dev-python/numpy/files/

[David Seifert]

commit: 53a3edfb4ad26a364e0886465523a342afea118e
Author: Mathy Vanvoorden  vanvoorden  be>
AuthorDate: Mon Oct 17 18:05:23 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Oct 18 20:02:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a3edfb

dev-python/numpy: fix broken import in version 1.11.2

The patch comes from upstream:
https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=596828

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2582

Signed-off-by: David Seifert  gentoo.org>

 .../files/numpy-1.11.2-import-module-fix.patch | 27 ++
 dev-python/numpy/numpy-1.11.2-r1.ebuild|  6 -
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch 
b/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch
new file mode 100644
index ..80b710b
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch
@@ -0,0 +1,27 @@
+From 5d0ce36e5be134bb5ead03cab1edeaa60fa355aa Mon Sep 17 00:00:00 2001
+From: Jonathan Helmus 
+Date: Wed, 12 Oct 2016 13:07:42 -0500
+Subject: [PATCH] BUG: import full module path in npy_load_module
+
+Use the full module path when importing importlib.machinery for use in the
+npy_load_module function. Just importing importlib is not sufficient in certain
+cases, for example Python 3.4.
+
+closes #8147
+---
+ numpy/compat/py3k.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py
+index 25cc535..d5bb2e4 100644
+--- a/numpy/compat/py3k.py
 b/numpy/compat/py3k.py
+@@ -118,7 +118,7 @@ def npy_load_module(name, fn, info=None):
+ mod : module
+ 
+ """
+-import importlib
++import importlib.machinery
+ return importlib.machinery.SourceFileLoader(name, fn).load_module()
+ else:
+ def npy_load_module(name, fn, info=None):

diff --git a/dev-python/numpy/numpy-1.11.2-r1.ebuild 
b/dev-python/numpy/numpy-1.11.2-r1.ebuild
index a5f25b2..0013fe1 100644
--- a/dev-python/numpy/numpy-1.11.2-r1.ebuild
+++ b/dev-python/numpy/numpy-1.11.2-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
@@ -37,6 +37,10 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch
+
+   # This has been fixed upstream but no new release yet
+   # 
https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa
+   "${FILESDIR}"/${P}-import-module-fix.patch
 )
 
 src_unpack() {