diff --git a/python-scikit-sparse.changes b/python-scikit-sparse.changes index 5c962b6..8c34c13 100644 --- a/python-scikit-sparse.changes +++ b/python-scikit-sparse.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Aug 5 02:43:30 UTC 2024 - Steve Kowalik + +- 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 diff --git a/python-scikit-sparse.spec b/python-scikit-sparse.spec index 8ceaba8..3ae4a2a 100644 --- a/python-scikit-sparse.spec +++ b/python-scikit-sparse.spec @@ -19,14 +19,12 @@ # For license file %define tag c94f8418b6c36c3ff9db4f87e00fc08bd51cfb4b Name: python-scikit-sparse -Version: 0.4.13 +Version: 0.4.15 Release: 0 Summary: Scikits sparse matrix package License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://github.com/scikit-sparse/scikit-sparse/ -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 +Source: https://files.pythonhosted.org/packages/source/s/scikit-sparse/scikit_sparse-%{version}.tar.gz BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy-devel >= 1.23.3} @@ -56,7 +54,9 @@ There is a wrapper for the CHOLMOD library for sparse Cholesky decomposition. %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 export CFLAGS="%{optflags}" @@ -67,7 +67,7 @@ export CFLAGS="%{optflags}" %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -%pytest_arch -ra --pyargs sksparse +%pytest_arch -ra --pyargs tests %files %{python_files} %doc README.md diff --git a/scikit-sparse-0.4.13.tar.gz b/scikit-sparse-0.4.13.tar.gz deleted file mode 100644 index 595bbb0..0000000 --- a/scikit-sparse-0.4.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb2190ca40e6bfa87bc81c0ee98277e173de7a7ae540d62784ed2bad7b7de25a -size 214199 diff --git a/scikit_sparse-0.4.15.tar.gz b/scikit_sparse-0.4.15.tar.gz new file mode 100644 index 0000000..b6c5171 --- /dev/null +++ b/scikit_sparse-0.4.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0b1ef1bbe9e28e5c6d2838c63c62e094a8098d11a736771edac55ccc5f9eabe +size 214398 diff --git a/support-scipy-1.14.patch b/support-scipy-1.14.patch deleted file mode 100644 index 5f39e6b..0000000 --- a/support-scipy-1.14.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ebbbaa4882eeac8fd4a2f4bf8c94c9e6b967cf54 Mon Sep 17 00:00:00 2001 -From: Steve Kowalik -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, :]] - ) - -