python3-numpy: update to 1.18.0.

This commit is contained in:
bra1nwave 2019-12-28 16:15:01 +01:00 committed by Juan RP
parent f130fb058a
commit 24c73a4e1c
2 changed files with 4 additions and 55 deletions

View File

@ -1,51 +0,0 @@
From af36784b2b38577a87208003d6827d02dc0c0fc2 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Thu, 24 Oct 2019 21:46:00 +1300
Subject: [PATCH] BUG: fix integer size confusion in handling array's ndmin
argument
The ndmin local variable was changed from an "int" to an "npy_intp" but
&ndmin is passed to PyArg_ParseTupleAndKeywords against a "i" argument
spec, but these integers have different sizes (well on an LP64 platform
anyway). This actually works on a little endian system but fails
on a big endian one. Fix this by converting the local back to an int,
and being a little careful before assigning the result of PyLong_AsLong to
it.
Fixes #14767
---
numpy/core/src/multiarray/multiarraymodule.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index 44156704996..9693275e74d 100644
--- numpy/core/src/multiarray/multiarraymodule.c
+++ numpy/core/src/multiarray/multiarraymodule.c
@@ -1562,8 +1562,7 @@ _array_fromobject(PyObject *NPY_UNUSED(ignored), PyObject *args, PyObject *kws)
PyArrayObject *oparr = NULL, *ret = NULL;
npy_bool subok = NPY_FALSE;
npy_bool copy = NPY_TRUE;
- int nd;
- npy_intp ndmin = 0;
+ int ndmin = 0, nd;
PyArray_Descr *type = NULL;
PyArray_Descr *oldtype = NULL;
NPY_ORDER order = NPY_KEEPORDER;
@@ -1625,13 +1624,14 @@ _array_fromobject(PyObject *NPY_UNUSED(ignored), PyObject *args, PyObject *kws)
ndmin_obj = PyDict_GetItem(kws, npy_ma_str_ndmin);
if (ndmin_obj) {
- ndmin = PyLong_AsLong(ndmin_obj);
- if (error_converting(ndmin)) {
+ long t = PyLong_AsLong(ndmin_obj);
+ if (error_converting(t)) {
goto clean_type;
}
- else if (ndmin > NPY_MAXDIMS) {
+ else if (t > NPY_MAXDIMS) {
goto full_path;
}
+ ndmin = t;
}
/* copy=False with default dtype, order (any is OK) and ndim */

View File

@ -1,7 +1,7 @@
# Template file for 'python3-numpy'
pkgname=python3-numpy
version=1.17.4
revision=2
version=1.18.0
revision=1
wrksrc="numpy-${version}"
build_style=python3-module
pycompile_module="numpy"
@ -9,11 +9,11 @@ hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
makedepends="python3-devel lapack-devel cblas-devel"
checkdepends="python3-pytest"
short_desc="Fast and sophisticated array facility to Python3"
maintainer="bra1nwave <brainwave@openmailbox.org>"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="BSD-3-Clause"
homepage="https://www.numpy.org/"
distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
checksum=e78ef65c08fc25c6172586e3b7ac366fbd49d9227d435d2f05184e9f3dd6317f
checksum=2e20cf94d675bebe9234945d71eadcf5bcf6e806234dc2fcedd8522588030128
alternatives="numpy:f2py:/usr/bin/f2py3"
nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/1408/steps/shell_3/logs/stdio"