From cb2c02b94da9d577dab6c2726d2f2dccd9c4e46f Mon Sep 17 00:00:00 2001 From: Justin Berthault Date: Thu, 4 Jun 2020 15:25:17 +0200 Subject: community/py3-numpy: upgrade to 1.18.5 --- community/py3-numpy/APKBUILD | 11 +++++------ community/py3-numpy/numpy-1.17.0-musl.patch | 8 ++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/community/py3-numpy/APKBUILD b/community/py3-numpy/APKBUILD index 61a74e40b7..4803ed159e 100644 --- a/community/py3-numpy/APKBUILD +++ b/community/py3-numpy/APKBUILD @@ -3,8 +3,7 @@ # Contributor: Martell Malone # Maintainer: Francesco Colista pkgname=py3-numpy -_pkgname=numpy -pkgver=1.18.4 +pkgver=1.18.5 pkgrel=0 pkgdesc="Scientific tools for Python" url="https://www.numpy.org/" @@ -18,10 +17,10 @@ makedepends="python3-dev cython openblas-dev>=0.3.0 subpackages="$pkgname-dev $pkgname-doc $pkgname-f2py::noarch" -source="https://github.com/numpy/numpy/releases/download/v$pkgver/$_pkgname-$pkgver.tar.gz +source="https://github.com/numpy/numpy/releases/download/v$pkgver/numpy-$pkgver.tar.gz numpy-1.17.0-musl.patch site.cfg" -builddir="$srcdir/$_pkgname-$pkgver" +builddir="$srcdir/numpy-$pkgver" prepare() { default_prepare @@ -55,6 +54,6 @@ dev() { default_dev } -sha512sums="8a238fccb686de9a59c6e8511a43f552394ede8519fe0d16e82549b9ebbef192788f3be9e0a57ee254c23e987d6260a30bc86d5f5d36c31c110708c1e042c9ea numpy-1.18.4.tar.gz -f9f2a89ad4409b14e2b46acedadfc5e8d79a749af6cad3c8d168bcaf21ca4379cd03be95f22485c35b41114604599bbeb9adaa96dff4194b01dc73e90c04a29f numpy-1.17.0-musl.patch +sha512sums="b4328fe695bd0df6b27060cfac7530b05e1417e40b43e4b48e3adbc399d9329d111f294b2e2562d73a530a150f3da54ccdc0c8e91e542a1f282cad3be7aedc33 numpy-1.18.5.tar.gz +2272f400594c1b2a3b69385fe0aa13d54cd12f4c4f1b109fa07789db7eec4bb681a68fd3d95ce9fb1342a5f76394e2381bb5fa8542631fc50b9a9335c512c690 numpy-1.17.0-musl.patch 21ca8db304cbbf5949f07702f2a42bb5e5a0d641921e36649555a41b0e48f04e96f53760417823177ac27f6de24b2191e6e1d5f0eb393beafa29f7484e23284f site.cfg" diff --git a/community/py3-numpy/numpy-1.17.0-musl.patch b/community/py3-numpy/numpy-1.17.0-musl.patch index 16265786f8..3088eefdbe 100644 --- a/community/py3-numpy/numpy-1.17.0-musl.patch +++ b/community/py3-numpy/numpy-1.17.0-musl.patch @@ -1,5 +1,5 @@ -diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h -index 44cdffd..f120094 100644 +Upstream: No +Reason: Enable build on endian musl --- a/numpy/core/include/numpy/npy_endian.h +++ b/numpy/core/include/numpy/npy_endian.h @@ -12,7 +12,7 @@ @@ -11,8 +11,6 @@ index 44cdffd..f120094 100644 #endif #if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && defined(LITTLE_ENDIAN) -diff --git a/numpy/core/setup.py b/numpy/core/setup.py -index 3385027..976e782 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -290,7 +290,7 @@ def check_types(config_cmd, ext, build_dir): @@ -24,8 +22,6 @@ index 3385027..976e782 100644 if res: private_defines.append(('HAVE_SYS_ENDIAN_H', 1)) public_defines.append(('NPY_HAVE_SYS_ENDIAN_H', 1)) -diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py -index 307fab3..916a216 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -120,7 +120,7 @@ OPTIONAL_HEADERS = [ -- cgit v1.2.3