diff --git a/0002-xfail-TestCond.test_nan_unonditionally.patch b/0002-xfail-TestCond.test_nan_unonditionally.patch new file mode 100644 index 0000000000000000000000000000000000000000..3c2432b276b9a917485216a2a2c45cb87f78bded --- /dev/null +++ b/0002-xfail-TestCond.test_nan_unonditionally.patch @@ -0,0 +1,14 @@ +diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py +index 24663b1..665bf0e 100644 +--- a/numpy/linalg/tests/test_linalg.py ++++ b/numpy/linalg/tests/test_linalg.py +@@ -759,6 +759,9 @@ class TestCond(CondCases): + for A, p in itertools.product(As, p_neg): + linalg.cond(A, p) + ++ @pytest.mark.xfail(True, run=False, ++ reason="Platform/LAPACK-dependent failure, " ++ "see gh-18914") + def test_nan(self): + # nans should be passed through, not converted to infs + ps = [None, 1, -1, 2, -2, 'fro'] diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..9c3a0c0c47cc299a8c5c55e091c8ecd57ab58333 --- /dev/null +++ b/download @@ -0,0 +1 @@ +48d6d97d6037eb8e171064a850b53aab numpy-1.17.3.tar.gz diff --git a/numpy-1.17.3.tar.gz b/numpy-1.17.3.tar.gz deleted file mode 100644 index 0436b8208b6675d7a5cd301cfb7aee09c64eae12..0000000000000000000000000000000000000000 Binary files a/numpy-1.17.3.tar.gz and /dev/null differ diff --git a/numpy.spec b/numpy.spec index 32f41e574d7772ce805ca94e89a2f4a4d86c49b2..b8e8cea5254a537aef3afe708bb57d842a5cb54c 100644 --- a/numpy.spec +++ b/numpy.spec @@ -9,7 +9,7 @@ Name: numpy Version: 1.17.3 -Release: 6%{anolis_release}%{?dist} +Release: 7%{anolis_release}%{?dist} Summary: A fast multidimensional array facility for Python # Everything is BSD except for class SafeEval in numpy/lib/utils.py which is Python @@ -19,6 +19,8 @@ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version} Source1: https://docs.scipy.org/doc/numpy/numpy-html-1.17.0.zip # Upstream issue: https://github.com/numpy/numpy/issues/13173 Patch0: 0001-Remove-failing-test-from-linalg-module.patch +# Upstream PR: https://github.com/numpy/numpy/pull/18943 +Patch1: 0002-xfail-TestCond.test_nan_unonditionally.patch Patch1000: 1000-numpy-anolis-support-loongarch64.patch @@ -166,7 +168,7 @@ touch %{buildroot}%{_bindir}/f2py3 %check %if %{with tests} -%if %{_arch} != s390x && %{_arch} != ppc64le +%if "%{_arch}" != "s390x" && "%{_arch}" != "ppc64le" %{__python3} runtests.py -v %endif %endif @@ -218,9 +220,13 @@ fi %changelog -* Thu Oct 20 2022 Liwei Ge - 1.17.3-6.0.1 +* Wed Dec 13 2023 Liwei Ge - 1.17.3-7.0.1 - Support loongarch64 platform +* Mon Jul 17 2023 Charalampos Stratakis - 1.17.3-7 +- Skip TestCond.test_nan +- Resolves: rhbz#2217862 + * Mon Aug 02 2021 Tomas Orsava - 1.17.3-6 - Adjusted the postun scriptlets to enable upgrading to RHEL 9 - Resolves: rhbz#1933055