diff --git a/csr_matrix-attr-H.patch b/csr_matrix-attr-H.patch new file mode 100644 index 0000000..56297d1 --- /dev/null +++ b/csr_matrix-attr-H.patch @@ -0,0 +1,20 @@ +From 44baef3d4e748135575e9b688894c01b37a3685b Mon Sep 17 00:00:00 2001 +From: Brian McFee +Date: Wed, 26 Jun 2024 10:08:45 -0400 +Subject: [PATCH] fix #1849 + +--- + librosa/core/constantq.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/librosa/core/constantq.py ++++ b/librosa/core/constantq.py +@@ -707,7 +707,7 @@ def icqt( + ) + + # Transpose the basis +- inv_basis = fft_basis.H.todense() ++ inv_basis = fft_basis.conjugate().T.todense() + + # Compute each filter's frequency-domain power + freq_power = 1 / np.sum(util.abs2(np.asarray(inv_basis)), axis=0) diff --git a/python-librosa.changes b/python-librosa.changes index 91d1daa..a0262a2 100644 --- a/python-librosa.changes +++ b/python-librosa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 2 20:59:35 UTC 2024 - Matej Cepl + +- Add csr_matrix-attr-H.patch making the package compatible with + the most recent version of SciPy (gh#librosa/librosa#1849). + ------------------------------------------------------------------- Fri Sep 20 22:12:01 UTC 2024 - Matej Cepl diff --git a/python-librosa.spec b/python-librosa.spec index 69d8fac..362df9b 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -30,6 +30,9 @@ Source1: librosa-create-pooch-cache.py Source2: librosa-pooch-cache.tar.gz # Static test data Source3: https://github.com/librosa/librosa-test-data/archive/%{static_test_data_commit}.tar.gz#/librosa-static-test-data-%{version}.tar.gz +# PATCH-FIX-UPSTREAM csr_matrix-attr-H.patch gh#librosa/librosa#1849 mcepl@suse.com +# csr_matrix.H in scipy has been removed +Patch0: csr_matrix-attr-H.patch BuildRequires: %{python_module SoundFile >= 0.12.1} BuildRequires: %{python_module audioread >= 2.1.9} BuildRequires: %{python_module base >= 3.7} @@ -38,7 +41,7 @@ BuildRequires: %{python_module joblib >= 0.14} BuildRequires: %{python_module lazy_loader >= 0.1} BuildRequires: %{python_module msgpack >= 1.0} BuildRequires: %{python_module numba >= 0.51.0} -BuildRequires: %{python_module numpy1 >= 1.22.3} +BuildRequires: %{python_module numpy >= 1.22.3 with %python-numpy < 2} BuildRequires: %{python_module pip} BuildRequires: %{python_module pooch >= 1.0} BuildRequires: %{python_module scikit-learn >= 0.20.0} @@ -142,6 +145,10 @@ notparallel+=" or test_remix" notparallel+=" or test_chroma" notparallel+=" or test_estimate_tuning" notparallel+=" or test_zero_crossings" +# gh#librosa/librosa#1879 +donttest+=" or test_beat" +# gh#librosa/librosa#1880 +donttest+=" or test_nnls_multiblock" %pytest -k "not (${donttest} or ${notparallel})" -n auto %pytest -k "not (${donttest}) and (${notparallel})"