From 870f53cef3413a865b27a07fa05c9d3c617356fbca89b866d2e8dc30ad76c0e6 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 2 Oct 2023 19:39:41 +0000 Subject: [PATCH 01/10] add testing of skipping one test OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-librosa?expand=0&rev=37 --- python-librosa.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python-librosa.spec b/python-librosa.spec index ee0a34e..8a279cd 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -129,6 +129,9 @@ notparallel+=" or test_remix" notparallel+=" or test_chroma" notparallel+=" or test_estimate_tuning" notparallel+=" or test_zero_crossings" +# ??? +donttest+="or test_match_events" +echo "not (${donttest} or ${notparallel})" %pytest -k "not (${donttest} or ${notparallel})" -n auto %pytest -k "not (${donttest}) and (${notparallel})" From 3e292ab1ad07a52887fc61d761e3ae166682682a4a453957067bce019f7b8191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 23 Oct 2023 07:16:00 +0000 Subject: [PATCH 02/10] osc copypac from project:devel:languages:python:numeric package:python-librosa revision:36 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-librosa?expand=0&rev=38 --- python-librosa.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/python-librosa.spec b/python-librosa.spec index 8a279cd..ee0a34e 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -129,9 +129,6 @@ notparallel+=" or test_remix" notparallel+=" or test_chroma" notparallel+=" or test_estimate_tuning" notparallel+=" or test_zero_crossings" -# ??? -donttest+="or test_match_events" -echo "not (${donttest} or ${notparallel})" %pytest -k "not (${donttest} or ${notparallel})" -n auto %pytest -k "not (${donttest}) and (${notparallel})" From 4dccc0353a7715387a99dbb566c3aad67531b3f3c133047e4adb08feefe244b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 23 Oct 2023 07:45:58 +0000 Subject: [PATCH 03/10] test OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-librosa?expand=0&rev=39 --- python-librosa.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-librosa.spec b/python-librosa.spec index ee0a34e..81e7e80 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -110,6 +110,7 @@ if [ $(getconf LONG_BIT) -eq 32 ]; then donttest+=" or test_multichannel" donttest+=" or test_time_stretch_multi" donttest+=" or test_piptrack_properties" + donttest+=" or test_piptrack_errors" donttest+=" or test_pitch_shift_multi" donttest+=" or test_split_multi" donttest+=" or test_hpss_multi" From ec8c709b58f417b668d33a0cf1e8682e10446d306853adccbb8f9e4b5499d1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 23 Oct 2023 07:50:51 +0000 Subject: [PATCH 04/10] fix2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-librosa?expand=0&rev=40 --- python-librosa.spec | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/python-librosa.spec b/python-librosa.spec index 81e7e80..83eabcf 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -104,20 +104,23 @@ donttest="test_display" # fails with current Tumbleweed donttest+=" or test_pyin_multi_center" # Overflow on 32-bit -if [ $(getconf LONG_BIT) -eq 32 ]; then - donttest+=" or test_tempo or test_hybrid_cqt or test_stft_winsizes" - donttest+=" or test_istft_reconstruction or test_trim" - donttest+=" or test_multichannel" - donttest+=" or test_time_stretch_multi" - donttest+=" or test_piptrack_properties" - donttest+=" or test_piptrack_errors" - donttest+=" or test_pitch_shift_multi" - donttest+=" or test_split_multi" - donttest+=" or test_hpss_multi" - donttest+=" or test_nn_filter_multi" - donttest+=" or (test_nnls_multiblock and 256)" - donttest+=" or (test_rms and (4096 or 4097))" -fi +%ifnarch x86_64 aarch64 +donttest+=" or test_tempo or test_hybrid_cqt or test_stft_winsizes" +donttest+=" or test_istft_reconstruction or test_trim" +donttest+=" or test_multichannel" +donttest+=" or test_time_stretch_multi" +donttest+=" or test_piptrack_properties" +donttest+=" or test_piptrack_errors" +donttest+=" or test_pitch_shift_multi" +donttest+=" or test_split_multi" +donttest+=" or test_hpss_multi" +donttest+=" or test_nn_filter_multi" +donttest+=" or (test_nnls_multiblock and 256)" +donttest+=" or (test_rms and (4096 or 4097))" +%endif +%ifarch aarch64 +donttest+=" or test_piptrack_errors" +%endif # Flaky segfaults when run in parallel, upstream does not test with xdist notparallel="test_piptrack" notparallel+=" or (test_onset_strength_audio and chroma_stft)" From 6ea2bacd6f25c1422b3b47c6e72a737cdc53f977daea42d904cff3ed8734d9d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 23 Oct 2023 07:59:51 +0000 Subject: [PATCH 05/10] fix3 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-librosa?expand=0&rev=41 --- python-librosa.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-librosa.spec b/python-librosa.spec index 83eabcf..a949b29 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -104,7 +104,7 @@ donttest="test_display" # fails with current Tumbleweed donttest+=" or test_pyin_multi_center" # Overflow on 32-bit -%ifnarch x86_64 aarch64 +%ifnarch x86_64 aarch64 ppc64le donttest+=" or test_tempo or test_hybrid_cqt or test_stft_winsizes" donttest+=" or test_istft_reconstruction or test_trim" donttest+=" or test_multichannel" @@ -120,6 +120,10 @@ donttest+=" or (test_rms and (4096 or 4097))" %endif %ifarch aarch64 donttest+=" or test_piptrack_errors" +donttest+=" or test_match_events_onesided" +%endif +%ifarch ppc64le +donttest+=" or test_cqt" %endif # Flaky segfaults when run in parallel, upstream does not test with xdist notparallel="test_piptrack" From e2c9e92af358add157814bf878b96bfb535b2302d27a0c3213b2aeac5d52953c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 23 Oct 2023 08:55:37 +0000 Subject: [PATCH 06/10] fix4 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-librosa?expand=0&rev=42 --- python-librosa.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-librosa.spec b/python-librosa.spec index a949b29..d548d09 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -121,6 +121,7 @@ donttest+=" or (test_rms and (4096 or 4097))" %ifarch aarch64 donttest+=" or test_piptrack_errors" donttest+=" or test_match_events_onesided" +donttest+=" or test_yin_tone" %endif %ifarch ppc64le donttest+=" or test_cqt" From ac2d3f40800acb8287853ff6973d5d0ab1c1cf76641ac8ab4014849bc7a7d190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 23 Oct 2023 09:50:12 +0000 Subject: [PATCH 07/10] fix OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-librosa?expand=0&rev=43 --- python-librosa.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-librosa.spec b/python-librosa.spec index d548d09..6a9e532 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -121,6 +121,7 @@ donttest+=" or (test_rms and (4096 or 4097))" %ifarch aarch64 donttest+=" or test_piptrack_errors" donttest+=" or test_match_events_onesided" +donttest+=" or test_yin" donttest+=" or test_yin_tone" %endif %ifarch ppc64le From 3ab27e952493ffdf36a18c4ee9a7ba0cf0f55e5e7e7c1a0cdaadddef4a4b9da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 23 Oct 2023 12:32:33 +0000 Subject: [PATCH 08/10] fix5 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-librosa?expand=0&rev=44 --- python-librosa.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-librosa.spec b/python-librosa.spec index 6a9e532..913b212 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -117,6 +117,7 @@ donttest+=" or test_hpss_multi" donttest+=" or test_nn_filter_multi" donttest+=" or (test_nnls_multiblock and 256)" donttest+=" or (test_rms and (4096 or 4097))" +donttest+=" or test_tonnetz_audio" %endif %ifarch aarch64 donttest+=" or test_piptrack_errors" From c86dfc33b1aedaee7effd983f0767497788c6b70a4bc068be89b6cd2f17a2a45 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Tue, 9 Jan 2024 17:41:49 +0000 Subject: [PATCH 09/10] - Don't use ifarch and ifnarch in noarch package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-librosa?expand=0&rev=45 --- python-librosa.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python-librosa.spec b/python-librosa.spec index 913b212..a116401 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -1,7 +1,7 @@ # # spec file for package python-librosa # -# 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 @@ -104,7 +104,8 @@ donttest="test_display" # fails with current Tumbleweed donttest+=" or test_pyin_multi_center" # Overflow on 32-bit -%ifnarch x86_64 aarch64 ppc64le +# can not use "ifarch" when BuildArch is set to noarch +%if "%_arch" != "x86_64" && "%_arch" != "aarch64" && "%_arch" != "ppc64le" donttest+=" or test_tempo or test_hybrid_cqt or test_stft_winsizes" donttest+=" or test_istft_reconstruction or test_trim" donttest+=" or test_multichannel" @@ -119,13 +120,13 @@ donttest+=" or (test_nnls_multiblock and 256)" donttest+=" or (test_rms and (4096 or 4097))" donttest+=" or test_tonnetz_audio" %endif -%ifarch aarch64 +%if "%_arch" == "aarch64" donttest+=" or test_piptrack_errors" donttest+=" or test_match_events_onesided" donttest+=" or test_yin" donttest+=" or test_yin_tone" %endif -%ifarch ppc64le +%if "%_arch" == "ppc64le" donttest+=" or test_cqt" %endif # Flaky segfaults when run in parallel, upstream does not test with xdist From 453ac1afff6cf16cb940bc7160ec3cd2c634183126cdaa429305678d56cd94d3 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 17 Apr 2024 03:42:37 +0000 Subject: [PATCH 10/10] - Skip a misbehaving test that can cause segfaults. - Drop back to ffmpeg 5. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-librosa?expand=0&rev=46 --- python-librosa.changes | 6 ++++++ python-librosa.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/python-librosa.changes b/python-librosa.changes index 9718072..439cdcb 100644 --- a/python-librosa.changes +++ b/python-librosa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 17 03:42:24 UTC 2024 - Steve Kowalik + +- Skip a misbehaving test that can cause segfaults. +- Drop back to ffmpeg 5. + ------------------------------------------------------------------- Sun Sep 24 17:38:22 UTC 2023 - Ben Greiner diff --git a/python-librosa.spec b/python-librosa.spec index a116401..b52a025 100644 --- a/python-librosa.spec +++ b/python-librosa.spec @@ -71,7 +71,7 @@ BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} BuildRequires: %{python_module resampy >= 0.2.2} BuildRequires: %{python_module samplerate} -BuildRequires: ffmpeg +BuildRequires: ffmpeg-5 # /SECTION %python_subpackages @@ -103,6 +103,8 @@ export LIBROSA_DATA_DIR=$PWD/librosa-pooch-cache donttest="test_display" # fails with current Tumbleweed donttest+=" or test_pyin_multi_center" +# causes interpreter SEGVs in some situations +donttest+=" or test_piptrack_errors" # Overflow on 32-bit # can not use "ifarch" when BuildArch is set to noarch %if "%_arch" != "x86_64" && "%_arch" != "aarch64" && "%_arch" != "ppc64le" @@ -111,7 +113,6 @@ donttest+=" or test_istft_reconstruction or test_trim" donttest+=" or test_multichannel" donttest+=" or test_time_stretch_multi" donttest+=" or test_piptrack_properties" -donttest+=" or test_piptrack_errors" donttest+=" or test_pitch_shift_multi" donttest+=" or test_split_multi" donttest+=" or test_hpss_multi"