From 5e3d09d5ea3b597b3d63751b52e9fe261d263fcc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 Oct 2023 10:10:04 -0400
Subject: [PATCH] python3-numpy: update to 1.26.1.

---
 ...ef779f9cfa353a0f3ceb598895810ce405e6.patch | 35 -------------------
 srcpkgs/python3-numpy/template                | 17 +++++----
 2 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/python3-numpy/patches/38edef779f9cfa353a0f3ceb598895810ce405e6.patch

diff --git a/srcpkgs/python3-numpy/patches/38edef779f9cfa353a0f3ceb598895810ce405e6.patch b/srcpkgs/python3-numpy/patches/38edef779f9cfa353a0f3ceb598895810ce405e6.patch
deleted file mode 100644
index 2a14521ad76..00000000000
--- a/srcpkgs/python3-numpy/patches/38edef779f9cfa353a0f3ceb598895810ce405e6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 38edef779f9cfa353a0f3ceb598895810ce405e6 Mon Sep 17 00:00:00 2001
-From: Sayed Adel <seiko@imavr.com>
-Date: Mon, 18 Sep 2023 10:12:35 +0400
-Subject: [PATCH] BLD, BUG: Fix build failure for host flags e.g.
- `-march=native` on unsupported architectures
-
----
- meson_cpu/meson.build | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/meson_cpu/meson.build b/meson_cpu/meson.build
-index 97b33c461b9..ed2313bc6a6 100644
---- a/meson_cpu/meson.build
-+++ b/meson_cpu/meson.build
-@@ -98,7 +98,7 @@ if host_machine.endian() == 'little' and cpu_family == 'ppc64'
-   min_features = [VSX2]
- endif
- 
--# Used by build option 'max'
-+# Used by build option 'max/native/detect'
- max_features_dict = {
-   'x86': X86_FEATURES,
-   'x86_64': X86_FEATURES,
-@@ -111,6 +111,11 @@ max_features = []
- foreach fet_name, fet_obj : max_features_dict
-   max_features += [fet_obj]
- endforeach
-+if max_features.length() == 0
-+  message('Disabling CPU feature detection due to unsupported architecture: "' + cpu_family + '"')
-+  CPU_CONF_BASELINE = 'none'
-+  CPU_CONF_DISPATCH = 'none'
-+endif
- 
- parse_options = {
-   'cpu-baseline': CPU_CONF_BASELINE,
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index e9806e90987..af4795e51c6 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.26.0
-revision=2
+version=1.26.1
+revision=1
 build_style=python3-pep517
 build_helper="meson qemu"
 make_build_args="-Csetup-args=-Ddisable-svml=true
@@ -19,7 +19,7 @@ license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 changelog="https://numpy.org/doc/stable/release.html"
 distfiles="${PYPI_SITE}/n/numpy/numpy-${version}.tar.gz"
-checksum=f93fc78fe8bf15afe2b8d6b6499f1c73953169fad1e9a8dd086cdff3190e7fdf
+checksum=c8c6c72d4a9f831f328efb1312642a1cafafaa88981d9ab76368d50d07d93cbe
 alternatives="numpy:f2py:/usr/bin/f2py3"
 
 build_options="openblas"
@@ -53,7 +53,6 @@ post_patch() {
 }
 
 do_check() {
-	local testjobs="-n $XBPS_MAKEJOBS"
 	local _skip
 
 	case $XBPS_TARGET_MACHINE in
@@ -73,8 +72,14 @@ do_check() {
 		_skip+="or(test_einsum_sums_int16)"
 	fi
 
-	echo python3 runtests.py -- ${testjobs} ${_skip+-k "not(${_skip#or})"}
-	python3 runtests.py -- ${testjobs} ${_skip+-k "not(${_skip#or})"}
+	# The NumPy test helper wants to use setuptools to deploy a test
+	# installation, which installs a broken f2py. Test against the wheel.
+	local testdir="${wrksrc}/.xbps-testdir/$(date +%s)"
+	python3 -m installer --destdir "${testdir}" dist/numpy*.whl
+
+	PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" \
+		python3 runtests.py --no-build -- \
+			-n "${XBPS_MAKEJOBS}" ${_skip+-k "not(${_skip#or})"}
 }
 
 post_install() {