commit python-scikit-sparse for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-scikit-sparse for openSUSE:Factory checked in at 2024-07-25 15:39:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-scikit-sparse (Old) and /work/SRC/openSUSE:Factory/.python-scikit-sparse.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-scikit-sparse" Thu Jul 25 15:39:47 2024 rev:8 rq:1189518 version:0.4.13 Changes: -------- --- /work/SRC/openSUSE:Factory/python-scikit-sparse/python-scikit-sparse.changes 2024-02-20 21:13:57.740996327 +0100 +++ /work/SRC/openSUSE:Factory/.python-scikit-sparse.new.1882/python-scikit-sparse.changes 2024-07-25 15:59:19.667740501 +0200 @@ -1,0 +2,12 @@ +Thu Jul 25 06:03:00 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com> + +- Update to 0.4.13: + * Fix breaking changes in isspmatrix of scipy >=1.11.0, discontinuing + compatibility with csc_array + * remove numpy build restrictions +- Drop patches scikit-sparse-py312.patch, scipy111.patch: + * Included upstream. +- Add patch support-scipy-1.14.patch: + * Do not call a now removed method in scipy. + +------------------------------------------------------------------- Old: ---- scikit-sparse-0.4.12.tar.gz scikit-sparse-py312.patch scipy111.patch New: ---- scikit-sparse-0.4.13.tar.gz support-scipy-1.14.patch BETA DEBUG BEGIN: Old: * remove numpy build restrictions - Drop patches scikit-sparse-py312.patch, scipy111.patch: * Included upstream. Old: * remove numpy build restrictions - Drop patches scikit-sparse-py312.patch, scipy111.patch: * Included upstream. BETA DEBUG END: BETA DEBUG BEGIN: New: * Included upstream. - Add patch support-scipy-1.14.patch: * Do not call a now removed method in scipy. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-scikit-sparse.spec ++++++ --- /var/tmp/diff_new_pack.rr0gMn/_old 2024-07-25 15:59:20.767784994 +0200 +++ /var/tmp/diff_new_pack.rr0gMn/_new 2024-07-25 15:59:20.783785641 +0200 @@ -19,20 +19,17 @@ # For license file %define tag c94f8418b6c36c3ff9db4f87e00fc08bd51cfb4b Name: python-scikit-sparse -Version: 0.4.12 +Version: 0.4.13 Release: 0 Summary: Scikits sparse matrix package License: GPL-2.0-or-later AND LGPL-2.1-or-later -Group: Development/Languages/Python 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 https://github.com/scikit-sparse/scikit-sparse/pull/102 Fix breaking changes in isspmatrix of scipy >=1.11.0 -Patch0: scipy111.patch -# PATCH-FIX-UPSTREAM scikit-sparse-py312.patch gh#scikit-sparse/scikit-sparse#105 -Patch1: scikit-sparse-py312.patch +# PATCH-FIX-UPSTREAM Based on gh#scikit-sparse/scikit-sparse#123 +Patch0: support-scipy-1.14.patch BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} -BuildRequires: %{python_module numpy-devel >= 1.13.3} +BuildRequires: %{python_module numpy-devel >= 1.23.3} BuildRequires: %{python_module pip} BuildRequires: %{python_module scipy >= 0.19} BuildRequires: %{python_module setuptools >= 18.0} @@ -40,7 +37,7 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: suitesparse-devel -Requires: python-numpy >= 1.13.3 +Requires: python-numpy >= 1.23.3 Requires: python-scipy >= 0.18 ExcludeArch: %{ix86} # SECTION test requirements @@ -76,5 +73,5 @@ %doc README.md %license LICENSE.txt %{python_sitearch}/sksparse -%{python_sitearch}/scikit_sparse-%{version}*-info +%{python_sitearch}/scikit_sparse-%{version}.dist-info ++++++ scikit-sparse-0.4.12.tar.gz -> scikit-sparse-0.4.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/PKG-INFO new/scikit-sparse-0.4.13/PKG-INFO --- old/scikit-sparse-0.4.12/PKG-INFO 2023-07-21 06:59:19.567062900 +0200 +++ new/scikit-sparse-0.4.13/PKG-INFO 2024-03-20 23:43:29.480010500 +0100 @@ -1,9 +1,9 @@ Metadata-Version: 2.1 Name: scikit-sparse -Version: 0.4.12 +Version: 0.4.13 Summary: Scikit sparse matrix package Home-page: https://github.com/scikit-sparse/scikit-sparse -Maintainer: Justin Ellis +Maintainer: Aaron Johnson Maintainer-email: justin.ellis18@gmail.com License: BSD Classifier: Development Status :: 3 - Alpha @@ -21,8 +21,11 @@ Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.11 -Requires-Python: >=3.6, <3.12 +Classifier: Programming Language :: Python :: 3.12 +Requires-Python: >=3.6 License-File: LICENSE.txt +Requires-Dist: numpy>=1.13.3 +Requires-Dist: scipy>=0.19 Sparse matrix tools. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/README.md new/scikit-sparse-0.4.13/README.md --- old/scikit-sparse-0.4.12/README.md 2023-07-21 06:58:55.000000000 +0200 +++ new/scikit-sparse-0.4.13/README.md 2024-03-20 23:43:07.000000000 +0100 @@ -2,7 +2,7 @@ [](https://pypi.org/project/scikit-sparse/) [](https://anaconda.org/conda-forge/scikit-sparse) [](https://github.com/scikit-sparse/scikit-sparse/actions/workflows/ci_test.yml) -[]() +[]() [](https://github.com/scikit-sparse/scikit-sparse/blob/master/LICENSE.txt) # scikit-sparse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/pyproject.toml new/scikit-sparse-0.4.13/pyproject.toml --- old/scikit-sparse-0.4.12/pyproject.toml 2023-07-21 06:58:55.000000000 +0200 +++ new/scikit-sparse-0.4.13/pyproject.toml 2024-03-20 23:43:07.000000000 +0100 @@ -25,11 +25,6 @@ "setuptools>=40.8.0", "wheel", "Cython>=0.22", - 'numpy==1.13.3; python_version=="3.6"', - 'numpy==1.14.5; python_version=="3.7"', - 'numpy==1.17.3; python_version=="3.8"', - 'numpy==1.19.3; python_version=="3.9"', - 'numpy==1.23.1; python_version=="3.10"', - 'numpy==1.23.5; python_version=="3.11"', + 'numpy>=1.13.3; python_version>="3.6"', ] build-backend = "setuptools.build_meta" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/scikit_sparse.egg-info/PKG-INFO new/scikit-sparse-0.4.13/scikit_sparse.egg-info/PKG-INFO --- old/scikit-sparse-0.4.12/scikit_sparse.egg-info/PKG-INFO 2023-07-21 06:59:19.000000000 +0200 +++ new/scikit-sparse-0.4.13/scikit_sparse.egg-info/PKG-INFO 2024-03-20 23:43:29.000000000 +0100 @@ -1,9 +1,9 @@ Metadata-Version: 2.1 Name: scikit-sparse -Version: 0.4.12 +Version: 0.4.13 Summary: Scikit sparse matrix package Home-page: https://github.com/scikit-sparse/scikit-sparse -Maintainer: Justin Ellis +Maintainer: Aaron Johnson Maintainer-email: justin.ellis18@gmail.com License: BSD Classifier: Development Status :: 3 - Alpha @@ -21,8 +21,11 @@ Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.11 -Requires-Python: >=3.6, <3.12 +Classifier: Programming Language :: Python :: 3.12 +Requires-Python: >=3.6 License-File: LICENSE.txt +Requires-Dist: numpy>=1.13.3 +Requires-Dist: scipy>=0.19 Sparse matrix tools. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/setup.py new/scikit-sparse-0.4.13/setup.py --- old/scikit-sparse-0.4.12/setup.py 2023-07-21 06:58:55.000000000 +0200 +++ new/scikit-sparse-0.4.13/setup.py 2024-03-20 23:43:07.000000000 +0100 @@ -9,6 +9,7 @@ # 2016 Alex Grigorievskiy <alex.grigorievskiy@gmail.com> # 2016-2017 Joscha Reimer <jor@informatik.uni-kiel.de> # 2021- Justin Ellis <justin.ellis18@gmail.com> +# 2022- Aaron Johnson <aaron9035@gmail.com> """Sparse matrix tools. @@ -30,7 +31,7 @@ DISTNAME = "scikit-sparse" DESCRIPTION = "Scikit sparse matrix package" LONG_DESCRIPTION = __doc__ -MAINTAINER = "Justin Ellis" +MAINTAINER = "Aaron Johnson" MAINTAINER_EMAIL = "justin.ellis18@gmail.com" URL = "https://github.com/scikit-sparse/scikit-sparse" LICENSE = "BSD" @@ -40,10 +41,13 @@ np.get_include(), sys.prefix + "/include", # Debian's suitesparse-dev installs to - # /usr/include/suitesparse "/usr/include/suitesparse", + # Homebrew macos-latest installs to + '/usr/local/opt/suite-sparse/include/suitesparse/', +] +LIBRARY_DIRS = [# Homebrew macos-latest installs to + '/usr/local/opt/suite-sparse/lib' ] -LIBRARY_DIRS = [] user_include_dir = os.getenv("SUITESPARSE_INCLUDE_DIR") user_library_dir = os.getenv("SUITESPARSE_LIBRARY_DIR") @@ -55,13 +59,13 @@ setup( install_requires=["numpy>=1.13.3", "scipy>=0.19"], - python_requires=">=3.6, <3.12", + python_requires=">=3.6", packages=find_packages(), package_data={ "": ["test_data/*.mtx.gz"], }, name=DISTNAME, - version="0.4.12", # remember to update __init__.py + version="0.4.13", # remember to update __init__.py maintainer=MAINTAINER, maintainer_email=MAINTAINER_EMAIL, description=DESCRIPTION, @@ -84,6 +88,7 @@ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], # You may specify the directory where CHOLMOD is installed using the # library_dirs and include_dirs keywords in the lines below. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/sksparse/__init__.py new/scikit-sparse-0.4.13/sksparse/__init__.py --- old/scikit-sparse-0.4.12/sksparse/__init__.py 2023-07-21 06:58:55.000000000 +0200 +++ new/scikit-sparse-0.4.13/sksparse/__init__.py 2024-03-20 23:43:07.000000000 +0100 @@ -1 +1 @@ -__version__ = "0.4.12" +__version__ = "0.4.13" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/sksparse/cholmod.pyx new/scikit-sparse-0.4.13/sksparse/cholmod.pyx --- old/scikit-sparse-0.4.12/sksparse/cholmod.pyx 2023-07-21 06:58:55.000000000 +0200 +++ new/scikit-sparse-0.4.13/sksparse/cholmod.pyx 2024-03-20 23:43:07.000000000 +0100 @@ -403,12 +403,12 @@ warnings.warn(full_msg, CholmodWarning) def _check_for_csc(m): - if not sparse.isspmatrix_csc(m): + if not sparse.isspmatrix_csc(m) or (hasattr(sparse, "csc_array") and isinstance(m, sparse.csc_array)): warnings.warn("converting matrix of class %s to CSC format" % (m.__class__.__name__,), CholmodTypeConversionWarning) m = m.tocsc() - assert sparse.isspmatrix_csc(m) + assert sparse.isspmatrix_csc(m) or (hasattr(sparse, "csc_array") and isinstance(m, sparse.csc_array)) return m cdef class Common: ++++++ support-scipy-1.14.patch ++++++ 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, :]] )
participants (1)
-
Source-Sync