From 286df3ecab18069d13e41484473930ba69e6e2e68c4ac59b794dfe57371ae1ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Tue, 16 Jul 2024 12:07:33 +0000
Subject: [PATCH] Accepting request 1186789 from
 home:bnavigator:branches:devel:languages:python:numeric

- Fix numpy-config path tests, provide reason for failing meson
  test
- Remove mistaken pycache rpmlint filter

OBS-URL: https://build.opensuse.org/request/show/1186789
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=162
---
 python-numpy-rpmlintrc |  3 ---
 python-numpy.changes   |  7 +++++++
 python-numpy.spec      | 17 ++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/python-numpy-rpmlintrc b/python-numpy-rpmlintrc
index f1db3af..673212c 100644
--- a/python-numpy-rpmlintrc
+++ b/python-numpy-rpmlintrc
@@ -5,6 +5,3 @@ addFilter("devel-file-in-non-devel-package .*numpy/_core/tests/data")
 addFilter("hidden-file-or-dir .*numpy/f2py/tests/src/assumed_shape/.f2py_f2cmap")
 addFilter("hidden-file-or-dir .*numpy/f2py/tests/src/f2cmap/.f2py_f2cmap")
 addFilter("zero-length .*numpy/core/__init__.pyi")
-# The pyc files are created after the py files, but the mtime of the pyc file,
-# its internal timestamp and the mtime of the py file are not equal.
-addFilter("python-bytecode-inconsistent-mtime .*")
diff --git a/python-numpy.changes b/python-numpy.changes
index ff15d04..bd9cdcd 100644
--- a/python-numpy.changes
+++ b/python-numpy.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 11 08:29:38 UTC 2024 - Ben Greiner <code@bnavigator.de>
+
+- Fix numpy-config path tests, provide reason for failing meson
+  test
+- Remove mistaken pycache rpmlint filter
+
 -------------------------------------------------------------------
 Fri Jun 28 06:47:52 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
 
diff --git a/python-numpy.spec b/python-numpy.spec
index e6b7a26..5b907df 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -284,11 +284,18 @@ EOF
 %check
 # https://numpy.org/doc/stable/dev/development_environment.html#running-tests
 %if %{without hpc}
-export PATH="%{buildroot}%{_bindir}:$PATH"
 
 mkdir -p testing
 cp pytest.ini testing/
 pushd testing
+%python_flavored_alternatives
+%if %{with libalternatives}
+%{python_expand #
+for b in f2py numpy-config; do
+  ln -s %{buildroot}%{_bindir}/$b-%{$python_bin_suffix} build/flavorbin/$b
+done
+}
+%endif
 
 # flaky tests
 test_failok+=" or test_structured_object_indexing"
@@ -343,11 +350,7 @@ test_failok+=" or (test_umath and test_fpclass)"
 test_failok+=" or (test_numeric and TestBoolCmp and test_float)"
 test_failok+=" or (test_umath and test_fp_noncontiguous)"
 %endif
-# These tests fail due to being unable to run numpy-config directly in the
-# source tree
-test_failok+=" or test_configtool_cflags or test_configtool_pkgconfigdir"
-test_failok+=" or test_configtool_version"
-# ??
+# The meson command is always on the primary python and wants to import numpy from there
 test_failok+=" or test_limited_api"
 
 echo "
@@ -378,7 +381,7 @@ popd
 %python_install_alternative f2py numpy-config
 
 %postun
-%python_uninstall_alternative f2py numpy-config
+%python_uninstall_alternative f2py
 %endif
 
 %files %{python_files}