1
0

Accepting request 1191565 from devel:languages:python:numeric

- Update to 0.4.15:
  * add publishing with a trusted publisher
  * Bump up numpy requirement
  * Autofind homebrew installation path
  * add publishing with a trusted publisher
  * Bump up numpy requirement
  * Autofind homebrew installation path
- Drop patch support-scipy-1.14.patch, included upstream.
- Move test_data under the tests directory and run tests there.

OBS-URL: https://build.opensuse.org/request/show/1191565
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-scikit-sparse?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2024-08-05 15:21:49 +00:00 committed by Git OBS Bridge
commit a12dea02ce
5 changed files with 22 additions and 33 deletions

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Aug 5 02:43:30 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
- Update to 0.4.15:
* add publishing with a trusted publisher
* Bump up numpy requirement
* Autofind homebrew installation path
* add publishing with a trusted publisher
* Bump up numpy requirement
* Autofind homebrew installation path
- Drop patch support-scipy-1.14.patch, included upstream.
- Move test_data under the tests directory and run tests there.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 25 06:03:00 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com> Thu Jul 25 06:03:00 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>

View File

@ -19,14 +19,12 @@
# For license file # For license file
%define tag c94f8418b6c36c3ff9db4f87e00fc08bd51cfb4b %define tag c94f8418b6c36c3ff9db4f87e00fc08bd51cfb4b
Name: python-scikit-sparse Name: python-scikit-sparse
Version: 0.4.13 Version: 0.4.15
Release: 0 Release: 0
Summary: Scikits sparse matrix package Summary: Scikits sparse matrix package
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://github.com/scikit-sparse/scikit-sparse/ URL: https://github.com/scikit-sparse/scikit-sparse/
Source: https://files.pythonhosted.org/packages/source/s/scikit-sparse/scikit-sparse-%{version}.tar.gz Source: https://files.pythonhosted.org/packages/source/s/scikit-sparse/scikit_sparse-%{version}.tar.gz
# PATCH-FIX-UPSTREAM Based on gh#scikit-sparse/scikit-sparse#123
Patch0: support-scipy-1.14.patch
BuildRequires: %{python_module Cython} BuildRequires: %{python_module Cython}
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: %{python_module numpy-devel >= 1.23.3} BuildRequires: %{python_module numpy-devel >= 1.23.3}
@ -56,7 +54,9 @@ There is a wrapper for the CHOLMOD library for sparse Cholesky
decomposition. decomposition.
%prep %prep
%autosetup -p1 -n scikit-sparse-%{version} %autosetup -p1 -n scikit_sparse-%{version}
# Move the test data to tests
mv sksparse/test_data tests
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
@ -67,7 +67,7 @@ export CFLAGS="%{optflags}"
%python_expand %fdupes %{buildroot}%{$python_sitearch} %python_expand %fdupes %{buildroot}%{$python_sitearch}
%check %check
%pytest_arch -ra --pyargs sksparse %pytest_arch -ra --pyargs tests
%files %{python_files} %files %{python_files}
%doc README.md %doc README.md

View File

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

View File

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

View File

@ -1,24 +0,0 @@
From ebbbaa4882eeac8fd4a2f4bf8c94c9e6b967cf54 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Thu, 25 Jul 2024 15:35:29 +1000
Subject: [PATCH] Switch to csc_matrix.T.conjugate() from .H
With scipy 1.14 csc_matrix.H has been removed, after being deprecated in
1.12. T.conjugate() is the replacement method, switch to it.
---
tests/test_cholmod.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sksparse/test_cholmod.py b/sksparse/test_cholmod.py
index ed2af70..95bdb18 100644
--- a/sksparse/test_cholmod.py
+++ b/sksparse/test_cholmod.py
@@ -94,7 +94,7 @@ def complex_matrix():
def factor_of(factor, matrix):
return np.allclose(
- (factor.L() * factor.L().H).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
+ (factor.L() * factor.L().T.conjugate()).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
)