From 0aad0bf4128e327403fdad1828ad6b7f2f1334d8 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Sun, 15 Oct 2023 03:31:06 +0000 Subject: [PATCH] upgpkg(main/python-numpy): 1.26.1 Signed-off-by: Kevin Williams --- packages/python-numpy/build.sh | 2 +- .../numpy-distutils-core.py.patch | 21 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 packages/python-numpy/numpy-distutils-core.py.patch diff --git a/packages/python-numpy/build.sh b/packages/python-numpy/build.sh index 2496c79fb6..33bd52cba3 100644 --- a/packages/python-numpy/build.sh +++ b/packages/python-numpy/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://numpy.org/ TERMUX_PKG_DESCRIPTION="The fundamental package for scientific computing with Python" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.26.0" +TERMUX_PKG_VERSION="1.26.1" TERMUX_PKG_SRCURL=git+https://github.com/numpy/numpy TERMUX_PKG_DEPENDS="libc++, libopenblas, python" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/python-numpy/numpy-distutils-core.py.patch b/packages/python-numpy/numpy-distutils-core.py.patch deleted file mode 100644 index 78bee975ff..0000000000 --- a/packages/python-numpy/numpy-distutils-core.py.patch +++ /dev/null @@ -1,21 +0,0 @@ -When building without meson, `setup.py` generates a weird verion string `1.26.1.26.0`. - -Numpy's code has a logical error when doing some code clean-up in commit [1]. -This causes the abnormal version string `1.26.01.26.0`, and then `setuptools` -normalized this string as `1.26.1.26.0`. - -See also: -[1] https://github.com/numpy/numpy/commit/a880c68752c47a63577e55689275b5fb9d6595a3 -[2] https://github.com/numpy/numpy/pull/24196#discussion_r1291739515 ---- a/numpy/distutils/core.py -+++ b/numpy/distutils/core.py -@@ -65,7 +65,8 @@ - elif isinstance(dv, dict): - _dict_append(dv, **v) - elif is_string(dv): -- d[k] = dv + v -+ assert is_string(v) -+ d[k] = v - else: - raise TypeError(repr(type(dv))) -