From 5a6a21aae75eaf89625c73edda1b5903ce86470b Mon Sep 17 00:00:00 2001 From: maokecheng Date: Tue, 26 Dec 2023 14:25:48 +0800 Subject: [PATCH] * Tue Dec 26 2023 maokecheng - 1.2.2-6 - Reference:https://github.com/scipy/scipy/commit/e8b57a3730bca08ec75c09ae8a6c9b443c7bf9f4 - DESC:dummy commit to investigate #10303 on CI --- ...y-commit-to-investigate-#10303-on-CI.patch | 24 +++++++++++++++++++ scipy.spec | 7 ++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 backport-BUG-optimize-dummy-commit-to-investigate-#10303-on-CI.patch diff --git a/backport-BUG-optimize-dummy-commit-to-investigate-#10303-on-CI.patch b/backport-BUG-optimize-dummy-commit-to-investigate-#10303-on-CI.patch new file mode 100644 index 0000000..0b6546f --- /dev/null +++ b/backport-BUG-optimize-dummy-commit-to-investigate-#10303-on-CI.patch @@ -0,0 +1,24 @@ +From b1fde70ea31bc1e015f0a929453ac757c83f23d7 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 26 Dec 2023 11:42:35 +0800 +Subject: [PATCH] BUG: optimize: dummy commit to investigate + +--- + scipy/optimize/_linprog_simplex.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scipy/optimize/_linprog_simplex.py b/scipy/optimize/_linprog_simplex.py +index 41e3b3f..f2f8cb9 100755 +--- a/scipy/optimize/_linprog_simplex.py ++++ b/scipy/optimize/_linprog_simplex.py +@@ -63,6 +63,7 @@ def _pivot_col(T, tol=1.0E-12, bland=False): + if ma.count() == 0: + return False, np.nan + if bland: ++ # ma.mask is sometimes 0d + return True, np.nonzero(ma.mask == False)[0][0] + return True, np.ma.nonzero(ma == ma.min())[0][0] + +-- +2.33.0 + diff --git a/scipy.spec b/scipy.spec index e381148..2dee847 100644 --- a/scipy.spec +++ b/scipy.spec @@ -3,7 +3,7 @@ Name: scipy Version: 1.2.2 -Release: 5 +Release: 6 Summary: A Python-based ecosystem of open-source software for mathematics, science, and engineering License: BSD, MIT, Boost and Public Domain URL: https://www.scipy.org @@ -12,7 +12,7 @@ Source0: https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{ve Patch1: backport-BUG-fix-a-minor-refcounting-issue-in-Py_FindObjects.patch Patch2: backport-BUG-fix-small-refcount-issue-in-ndimage._ctest.patch Patch3: backport-CVE-2023-29824.patch - +Patch4: backport-BUG-optimize-dummy-commit-to-investigate-#10303-on-CI BuildRequires: python3-devel python3-numpy >= 1.8.2 python3-numpy-f2py #BuildRequires: python3-pytest %if %{with python2} @@ -135,6 +135,9 @@ env FFLAGS="$RPM_OPT_FLAGS -fPIC" \ %endif %changelog +* Tue Dec 26 2023 maokecheng - 1.2.2-6 +- DESC:dummy commit to investigate #10303 on CI + * Fri Dec 22 2023 xuyuchao - 1.2.2-5 - Type:CVE - CVE:CVE-2023-29824 -- Gitee