Accepting request 1194834 from devel:languages:python:numeric

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1194834
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=130

0001-BUG-Fix-test_impossible_feature_enable-failing-witho.patch

@@ -1,64 +0,0 @@
-From bf50761dee8f0670542bcdc1fd9bff5cdb0448d4 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Thu, 28 Mar 2024 14:39:45 +0100
-Subject: [PATCH] BUG: Fix test_impossible_feature_enable failing without
- BASELINE_FEAT
-
-If the build has no baseline features set, the test ended up setting
-e.g. NPY_ENABLE_CPU_FEATURES="ASIMDHP, None". This actually made the
-execution succeed, as the warning for decoding "None" overrode the
-error for the real feature. Fix the error handling there by removing
-the errorneous "return 0;", add a test for this, and avoid passing
-"None" by accident.
----
- numpy/core/src/common/npy_cpu_features.c |  1 -
- numpy/core/tests/test_cpu_features.py    | 14 ++++++++++++--
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/numpy/core/src/common/npy_cpu_features.c b/numpy/core/src/common/npy_cpu_features.c
-index bd149f8b4..f4d25cc50 100644
---- a/numpy/core/src/common/npy_cpu_features.c
-+++ b/numpy/core/src/common/npy_cpu_features.c
-@@ -324,7 +324,6 @@ npy__cpu_check_env(int disable, const char *env) {
-         ) < 0) {
-             return -1;
-         }
--        return 0;
-     }
- 
-     #define NOTSUPP_BODY \
-diff --git a/numpy/core/tests/test_cpu_features.py b/numpy/core/tests/test_cpu_features.py
-index 48ab30a4a..88e4ad185 100644
---- a/numpy/core/tests/test_cpu_features.py
-+++ b/numpy/core/tests/test_cpu_features.py
-@@ -308,8 +308,8 @@ def test_impossible_feature_enable(self):
-         err_type = "RuntimeError"
-         self._expect_error(msg, err_type)
- 
--        # Ensure that only the bad feature gets reported
--        feats = f"{bad_feature}, {self.BASELINE_FEAT}"
-+        # Ensure that it fails even when providing garbage in addition
-+        feats = f"{bad_feature}, Foobar"
-         self.env['NPY_ENABLE_CPU_FEATURES'] = feats
-         msg = (
-             f"You cannot enable CPU features \\({bad_feature}\\), since they "
-@@ -317,6 +317,16 @@ def test_impossible_feature_enable(self):
-         )
-         self._expect_error(msg, err_type)
- 
-+        if self.BASELINE_FEAT is not None:
-+            # Ensure that only the bad feature gets reported
-+            feats = f"{bad_feature}, {self.BASELINE_FEAT}"
-+            self.env['NPY_ENABLE_CPU_FEATURES'] = feats
-+            msg = (
-+                f"You cannot enable CPU features \\({bad_feature}\\), since "
-+                "they are not supported by your machine."
-+            )
-+            self._expect_error(msg, err_type)
-+
- is_linux = sys.platform.startswith('linux')
- is_cygwin = sys.platform.startswith('cygwin')
- machine  = platform.machine()
--- 
-2.44.0
-

0001-feature-module-Fix-handling-of-multiple-conflicts-pe.patch

@@ -1,46 +0,0 @@
-From 79e7c3c3262374de778145946b612135fb7cd581 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Thu, 28 Mar 2024 13:15:54 +0100
-Subject: [PATCH] feature module: Fix handling of multiple conflicts per
- attribute
-
-- Attributes without match were never actually added to the list
-- Only the last conflict actually had an effect, earlier results were
-  discarded
----
- vendored-meson/meson/mesonbuild/modules/features/module.py | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/vendored-meson/meson/mesonbuild/modules/features/module.py b/vendored-meson/meson/mesonbuild/modules/features/module.py
-index 0be6af06c..a6f357b3f 100644
---- a/vendored-meson/meson/mesonbuild/modules/features/module.py
-+++ b/vendored-meson/meson/mesonbuild/modules/features/module.py
-@@ -371,15 +371,12 @@ class Module(NewExtensionModule):
-                 values: List[ConflictAttr] = getattr(fet, attr)
-                 accumulate_values = test_result[attr]  # type: ignore
-                 for conflict in values:
--                    if not conflict.match:
--                        accumulate_values.append(conflict.val)
--                        continue
-                     conflict_vals: List[str] = []
-                     # select the acc items based on the match
-                     new_acc: List[str] = []
-                     for acc in accumulate_values:
-                         # not affected by the match so we keep it
--                        if not conflict.match.match(acc):
-+                        if not (conflict.match and conflict.match.match(acc)):
-                             new_acc.append(acc)
-                             continue
-                         # no filter so we totaly escape it
-@@ -396,7 +393,7 @@ class Module(NewExtensionModule):
-                             continue
-                         conflict_vals.append(conflict.mjoin.join(filter_val))
-                     new_acc.append(conflict.val + conflict.mjoin.join(conflict_vals))
--                    test_result[attr] = new_acc  # type: ignore
-+                    accumulate_values = test_result[attr] = new_acc  # type: ignore
- 
-         test_args = compiler.has_multi_arguments
-         args = test_result['args']
--- 
-2.44.0
-

fix-meson-multiple-python-versions.patch

@@ -1,53 +0,0 @@
-From 59694be29a71b17ad1ce58c865a5524c50bfedee Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Fri, 16 Feb 2024 22:18:43 +0100
-Subject: [PATCH] TST: fix Cython compile test which invokes `meson`
-
-Closes gh-24956
-
-[skip circle]
----
- numpy/core/tests/test_cython.py | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-Index: numpy-1.26.4/numpy/core/tests/test_cython.py
-===================================================================
---- numpy-1.26.4.orig/numpy/core/tests/test_cython.py
-+++ numpy-1.26.4/numpy/core/tests/test_cython.py
-@@ -37,6 +37,13 @@ def install_temp(tmpdir_factory):
-     srcdir = os.path.join(os.path.dirname(__file__), 'examples', 'cython')
-     build_dir = tmpdir_factory.mktemp("cython_test") / "build"
-     os.makedirs(build_dir, exist_ok=True)
-+    # Ensure we use the correct Python interpreter even when `meson` is
-+    # installed in a different Python environment (see gh-24956)
-+    native_file = str(build_dir / 'interpreter-native-file.ini')
-+    with open(native_file, 'w') as f:
-+        f.write("[binaries]\n")
-+        f.write(f"python = '{sys.executable}'")
-+
-     try:
-         subprocess.check_call(["meson", "--version"])
-     except FileNotFoundError:
-@@ -44,17 +51,20 @@ def install_temp(tmpdir_factory):
-     if sys.platform == "win32":
-         subprocess.check_call(["meson", "setup",
-                                "--buildtype=release",
--                               "--vsenv", str(srcdir)],
-+                               "--vsenv", "--native-file", native_file,
-+                               str(srcdir)],
-                               cwd=build_dir,
-                               )
-     else:
--        subprocess.check_call(["meson", "setup", str(srcdir)],
-+        subprocess.check_call(["meson", "setup",
-+                               "--native-file", native_file, str(srcdir)],
-                               cwd=build_dir
-                               )
-     subprocess.check_call(["meson", "compile", "-vv"], cwd=build_dir)
- 
-     sys.path.append(str(build_dir))
- 
-+
- def test_is_timedelta64_object(install_temp):
-     import checks
- 

numpy-1.26.4.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010
-size 15786129

numpy-1.9.0-remove-__declspec.patch

@@ -1,28 +0,0 @@
-From: toddrme2178@gmail.com
-Date: 2014-09-09 04:45:00 +0000
-Subject: Remove windows-specific function
-Upstream: openSUSE Fix
-References: 
-    http://lists.opensuse.org/opensuse-packaging/2014-09/msg00004.html
-    http://lists.opensuse.org/opensuse-packaging/2014-09/msg00005.html
-
-__declspec(thread) is a windows-specific function that is causing
-spurious compiler warnings.  These warnings can be safely ignored,
-but are being falsely flagged as serious problems that cause the
-build to fail.  Since this is windows-specific, it can be 
-safely removed.
-
-
-Index: numpy-1.24.0/numpy/core/setup_common.py
-===================================================================
---- numpy-1.24.0.orig/numpy/core/setup_common.py
-+++ numpy-1.24.0/numpy/core/setup_common.py
-@@ -141,7 +141,7 @@ OPTIONAL_FILE_FUNCS = ["ftello", "fseeko
- OPTIONAL_MISC_FUNCS = ["backtrace", "madvise"]
- 
- # variable attributes tested via "int %s a" % attribute
--OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread", "__declspec(thread)"]
-+OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread"]
- 
- # Subset of OPTIONAL_*_FUNCS which may already have HAVE_* defined by Python.h
- OPTIONAL_FUNCS_MAYBE = [