Skip to content

Commit 6cfe8e2

Browse files
committed
Fix compatibility with scipy >= 1.13
1 parent a9d95eb commit 6cfe8e2

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

docs/example.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ resampy allows you to control the design of the filters used in resampling opera
113113
x, sr_orig = librosa.load(librosa.ex('trumpet'), sr=None, mono=False)
114114
115115
# Resample to 22050Hz using a Hann-windowed sinc-filter
116-
y = resampy.resample(x, sr_orig, sr_new, filter='sinc_window', window=scipy.signal.hann)
116+
y = resampy.resample(x, sr_orig, sr_new, filter='sinc_window', window=scipy.signal.windows.hann)
117117
118118
# Or a shorter sinc-filter than the default (num_zeros=64)
119119
y = resampy.resample(x, sr_orig, sr_new, filter='sinc_window', num_zeros=32)

resampy/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def resample(
8181
>>> # Resample using a Hann-windowed sinc filter
8282
>>> import scipy.signal
8383
>>> resampy.resample(x, sr_orig, 22050, filter='sinc_window',
84-
... window=scipy.signal.hann)
84+
... window=scipy.signal.windows.hann)
8585
array([ 0.011, 0.123, 0.25 , ..., -0.366, -0.25 , -0.123])
8686
8787
>>> # Generate stereo data

resampy/filters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def sinc_window(num_zeros=64, precision=9, window=None, rolloff=0.945):
100100
>>> # A filter with 10 zero-crossings, 32 samples per crossing, and a
101101
>>> # Hann window for tapering.
102102
>>> halfwin, prec, rolloff = resampy.filters.sinc_window(num_zeros=10, precision=5,
103-
... window=scipy.signal.hann)
103+
... window=scipy.signal.windows.hann)
104104
>>> halfwin
105105
array([ 9.450e-01, 9.436e-01, ..., -7.455e-07, -0.000e+00])
106106
>>> prec
@@ -111,7 +111,7 @@ def sinc_window(num_zeros=64, precision=9, window=None, rolloff=0.945):
111111
>>> # Or using sinc-window filter construction directly in resample
112112
>>> y = resampy.resample(x, sr_orig, sr_new, filter='sinc_window',
113113
... num_zeros=10, precision=5,
114-
... window=scipy.signal.hann) # doctest: +SKIP
114+
... window=scipy.signal.windows.hann) # doctest: +SKIP
115115
'''
116116

117117
if window is None:

scripts/create_filter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def parse_arguments(args):
8585

8686
def get_window(beta=None, rolloff=None, num_zeros=None):
8787
"""Build the full window from a specification"""
88-
win = functools.partial(scipy.signal.kaiser, beta=beta)
88+
win = functools.partial(scipy.signal.windows.kaiser, beta=beta)
8989
fil = resampy.filters.sinc_window(
9090
num_zeros=num_zeros, precision=1, window=win, rolloff=rolloff
9191
)[0]
@@ -157,7 +157,7 @@ def objective(trial, num_zeros, min_beta, max_beta, min_rolloff, attenuation):
157157
print("-" * 40)
158158
print(f"Objective value: {study.best_value:g}")
159159

160-
window = functools.partial(scipy.signal.kaiser, beta=study.best_params["beta"])
160+
window = functools.partial(scipy.signal.windows.kaiser, beta=study.best_params["beta"])
161161
half_win, precision, roll = resampy.filters.sinc_window(
162162
num_zeros=params.num_zeros,
163163
precision=params.precision,

0 commit comments

Comments
 (0)