diff --git a/python-scikit-sparse.changes b/python-scikit-sparse.changes index 258a8ea..501af67 100644 --- a/python-scikit-sparse.changes +++ b/python-scikit-sparse.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 18 15:19:40 UTC 2024 - Ben Greiner + +- Add scikit-sparse-py312.patch gh#scikit-sparse/scikit-sparse#105 + ------------------------------------------------------------------- Fri Sep 8 16:56:21 UTC 2023 - Matej Cepl diff --git a/python-scikit-sparse.spec b/python-scikit-sparse.spec index 7f4dc77..594216d 100644 --- a/python-scikit-sparse.spec +++ b/python-scikit-sparse.spec @@ -1,7 +1,7 @@ # # spec file for package python-scikit-sparse # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,8 +26,10 @@ 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 +# 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 BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy-devel >= 1.13.3} @@ -38,7 +40,7 @@ BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: suitesparse-devel -Requires: python-numpy >= 1.12 +Requires: python-numpy >= 1.13.3 Requires: python-scipy >= 0.18 ExcludeArch: %{ix86} # SECTION test requirements diff --git a/scikit-sparse-py312.patch b/scikit-sparse-py312.patch new file mode 100644 index 0000000..3bf2b17 --- /dev/null +++ b/scikit-sparse-py312.patch @@ -0,0 +1,43 @@ +From 60e672ee846e081658e4d74525ab5584358fefdb Mon Sep 17 00:00:00 2001 +From: Christian Glusa +Date: Sun, 26 Nov 2023 17:55:43 -0700 +Subject: [PATCH] remove numpy build restrictions, add Python 3.12 build to + github action + +--- + .github/workflows/ci_test.yml | 2 +- + pyproject.toml | 7 +------ + setup.py | 2 +- + 3 files changed, 3 insertions(+), 8 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 682d8bc..bf7703e 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -25,11 +25,6 @@ requires = [ + "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 --git a/setup.py b/setup.py +index f7e7af1..e7ec38b 100644 +--- a/setup.py ++++ b/setup.py +@@ -55,7 +55,7 @@ + + 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"],