Skip to content

Commit 676abf8

Browse files
authored
👽️ signal: 1.15.0 support (#348)
2 parents 017c2e1 + 29ced07 commit 676abf8

18 files changed

+528
-230
lines changed

.mypyignore-todo

+12-34
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,40 @@
1-
scipy\.signal\._bsplines
2-
scipy\.signal\._spectral
3-
scipy\.signal\.(_?filter_design\.)?__all__
4-
scipy\.signal\.(_?filter_design\.)?freqz_sos
5-
scipy\.signal\.(_?signaltools\.)?__all__
6-
scipy\.signal\.(_?signaltools\.)?cmplx_sort
7-
scipy\.signal\.(_?signaltools\.)?envelope
8-
scipy\.signal\.(_spectral_py\.)?lombscargle
9-
scipy\.signal\.(_?waveforms\.)?chirp
10-
scipy\.signal\.(_?wavelets\.)?__all__
11-
scipy\.signal\.(_?wavelets\.)?cascade
12-
scipy\.signal\.(_?wavelets\.)?cwt
13-
scipy\.signal\.(_?wavelets\.)?daub
14-
scipy\.signal\.(_?wavelets\.)?morlet2?
15-
scipy\.signal\.(_?wavelets\.)?qmf
16-
scipy\.signal\.(_?wavelets\.)?ricker
17-
scipy\.signal\.(spectral\.)?lombscargle
18-
scipy\.signal\._?spline\.(c|q)spline2d
19-
scipy\.signal\._?spline\.symiirorder(1|2)
20-
scipy\.signal\._spline\.symiirorder1_ic
21-
scipy\.signal\._spline\.symiirorder2_ic_(bwd|fwd)
22-
scipy\.signal\.(spline|wavelets)\.__all__
23-
scipy\.signal\.wavelets\.convolve
24-
251
scipy\.sparse\.__all__
2+
scipy\.sparse\._sputils\.__all__
263
scipy\.sparse\._(data\._data|compressed\._cs)_matrix\.__init__
274
scipy\.sparse\._(base\._sp|bsr\._bsr_|coo\._coo_|dia\._dia_|dok\._dok_|lil\._lil_)base\.__init__
285
scipy\.sparse\._(base\._sp|coo\._coo_|dia\._dia_|dok\._dok_|lil\._lil_)base\.count_nonzero
296
scipy\.sparse\.((_?base|_matrix|bsr|coo|csc|csr|dia|dok)\.)?spmatrix\.todense
307
scipy\.sparse\.(_?construct\.)?rand(om(_array)?)?
318
scipy\.sparse\._coo\._coo_base\.tensordot
329
scipy\.sparse\._data\._minmax_mixin\.(arg|nan)?(max|min)
33-
scipy\.sparse\._sputils\.__all__
3410
scipy\.sparse\._sputils\.broadcast_shapes
3511
scipy\.sparse\.(_sputils|base|compressed|bsr|coo|dia|dok)\.check_shape
3612
scipy\.sparse\.(_sputils|compressed|bsr|coo|dia|dok)\.isshape
37-
scipy\.sparse\.csgraph\.(_matching\.)?min_weight_full_bipartite_matching
3813
scipy\.sparse\.get_index_dtype
14+
scipy\.sparse\.safely_cast_index_arrays
15+
16+
scipy\.sparse\.csgraph\.(_matching\.)?min_weight_full_bipartite_matching
17+
3918
scipy\.sparse\.linalg\._dsolve\.linsolve\.__all__
4019
scipy\.sparse\.linalg\._dsolve\.linsolve\.is_sptriangular
4120
scipy\.sparse\.linalg\._dsolve\.linsolve\.spbandwidth
4221
scipy\.sparse\.linalg\.(_dsolve\.(linsolve\.)?)?splu
4322
scipy\.sparse\.linalg\.(_?eigen\.(_svds\.)?)?svds
44-
scipy\.sparse\.safely_cast_index_arrays
23+
4524

4625
scipy\.spatial\.distance\.directed_hausdorff
4726
scipy\.spatial\.transform\.(_?rotation\.)?Rotation\.random
4827

28+
29+
scipy\.special\.(cython_special\.)?btdtri?
30+
scipy\.special\.(assoc_)?legendre_p(_all)?
31+
scipy\.special\.sph_(harm_y|legendre_p)(_all)?
4932
scipy\.special\.(_basic\.)?__all__
50-
scipy\.special\.(_?basic\.)?factorial
51-
scipy\.special\.(_?basic\.)?factorial2
52-
scipy\.special\.(_?basic\.)?factorialk
5333
scipy\.special\.(_basic\.)?softplus
54-
scipy\.special\.(cython_special\.)?btdtr
55-
scipy\.special\.(cython_special\.)?btdtri
34+
scipy\.special\.(_?basic\.)?factorial(2|k)?
5635
scipy\.special\._spherical_bessel\.spherical_kn_reflection
5736
scipy\.special\._spherical_bessel\.use_reflection
58-
scipy\.special\.(assoc_)?legendre_p(_all)?
59-
scipy\.special\.sph_(harm_y|legendre_p)(_all)?
37+
6038

6139
scipy\.stats\.__all__
6240
scipy\.stats\.distributions\.__all__

scipy-stubs/signal/__init__.pyi

+124-21
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,131 @@ from . import (
1111
wavelets,
1212
windows,
1313
)
14-
from ._bsplines import *
15-
from ._czt import *
16-
from ._filter_design import *
17-
from ._fir_filter_design import *
18-
from ._lti_conversion import *
19-
from ._ltisys import *
14+
from ._czt import CZT, ZoomFFT, czt, czt_points, zoom_fft
15+
from ._filter_design import (
16+
BadCoefficients,
17+
band_stop_obj,
18+
bessel,
19+
besselap,
20+
bilinear,
21+
bilinear_zpk,
22+
buttap,
23+
butter,
24+
buttord,
25+
cheb1ap,
26+
cheb1ord,
27+
cheb2ap,
28+
cheb2ord,
29+
cheby1,
30+
cheby2,
31+
ellip,
32+
ellipap,
33+
ellipord,
34+
findfreqs,
35+
freqs,
36+
freqs_zpk,
37+
freqz,
38+
freqz_sos,
39+
freqz_zpk,
40+
gammatone,
41+
group_delay,
42+
iircomb,
43+
iirdesign,
44+
iirfilter,
45+
iirnotch,
46+
iirpeak,
47+
lp2bp,
48+
lp2bp_zpk,
49+
lp2bs,
50+
lp2bs_zpk,
51+
lp2hp,
52+
lp2hp_zpk,
53+
lp2lp,
54+
lp2lp_zpk,
55+
normalize,
56+
sos2tf,
57+
sos2zpk,
58+
sosfreqz,
59+
tf2sos,
60+
tf2zpk,
61+
zpk2sos,
62+
zpk2tf,
63+
)
64+
from ._fir_filter_design import firls, firwin, firwin2, kaiser_atten, kaiser_beta, kaiserord, minimum_phase, remez
65+
from ._lti_conversion import abcd_normalize, cont2discrete, ss2tf, ss2zpk, tf2ss, zpk2ss
66+
from ._ltisys import (
67+
StateSpace,
68+
TransferFunction,
69+
ZerosPolesGain,
70+
bode,
71+
dbode,
72+
dfreqresp,
73+
dimpulse,
74+
dlsim,
75+
dlti,
76+
dstep,
77+
freqresp,
78+
impulse,
79+
lsim,
80+
lti,
81+
place_poles,
82+
step,
83+
)
2084
from ._max_len_seq import max_len_seq
21-
from ._peak_finding import *
85+
from ._peak_finding import argrelextrema, argrelmax, argrelmin, find_peaks, find_peaks_cwt, peak_prominences, peak_widths
2286
from ._savitzky_golay import savgol_coeffs, savgol_filter
23-
from ._short_time_fft import *
24-
from ._signaltools import *
25-
from ._spectral_py import *
26-
from ._spline import cspline2d, qspline2d, sepfir2d, symiirorder1, symiirorder2
87+
from ._short_time_fft import ShortTimeFFT
88+
from ._signaltools import (
89+
choose_conv_method,
90+
convolve,
91+
convolve2d,
92+
correlate,
93+
correlate2d,
94+
correlation_lags,
95+
decimate,
96+
deconvolve,
97+
detrend,
98+
envelope,
99+
fftconvolve,
100+
filtfilt,
101+
hilbert,
102+
hilbert2,
103+
invres,
104+
invresz,
105+
lfilter,
106+
lfilter_zi,
107+
lfiltic,
108+
medfilt,
109+
medfilt2d,
110+
oaconvolve,
111+
order_filter,
112+
resample,
113+
resample_poly,
114+
residue,
115+
residuez,
116+
sosfilt,
117+
sosfilt_zi,
118+
sosfiltfilt,
119+
unique_roots,
120+
vectorstrength,
121+
wiener,
122+
)
123+
from ._spectral_py import check_COLA, check_NOLA, coherence, csd, istft, lombscargle, periodogram, spectrogram, stft, welch
124+
from ._spline import sepfir2d
125+
from ._spline_filters import (
126+
cspline1d,
127+
cspline1d_eval,
128+
cspline2d,
129+
gauss_spline,
130+
qspline1d,
131+
qspline1d_eval,
132+
qspline2d,
133+
spline_filter,
134+
symiirorder1,
135+
symiirorder2,
136+
)
27137
from ._upfirdn import upfirdn
28-
from ._waveforms import *
29-
from ._wavelets import *
138+
from ._waveforms import chirp, gausspulse, sawtooth, square, sweep_poly, unit_impulse
30139
from .windows import get_window
31140

32141
__all__ = [
@@ -51,7 +160,6 @@ __all__ = [
51160
"buttap",
52161
"butter",
53162
"buttord",
54-
"cascade",
55163
"cheb1ap",
56164
"cheb1ord",
57165
"cheb2ap",
@@ -62,7 +170,6 @@ __all__ = [
62170
"check_NOLA",
63171
"chirp",
64172
"choose_conv_method",
65-
"cmplx_sort",
66173
"coherence",
67174
"cont2discrete",
68175
"convolve",
@@ -74,10 +181,8 @@ __all__ = [
74181
"cspline1d",
75182
"cspline1d_eval",
76183
"cspline2d",
77-
"cwt",
78184
"czt",
79185
"czt_points",
80-
"daub",
81186
"dbode",
82187
"decimate",
83188
"deconvolve",
@@ -90,6 +195,7 @@ __all__ = [
90195
"ellip",
91196
"ellipap",
92197
"ellipord",
198+
"envelope",
93199
"fftconvolve",
94200
"filter_design",
95201
"filtfilt",
@@ -104,6 +210,7 @@ __all__ = [
104210
"freqs",
105211
"freqs_zpk",
106212
"freqz",
213+
"freqz_sos",
107214
"freqz_zpk",
108215
"gammatone",
109216
"gauss_spline",
@@ -144,16 +251,13 @@ __all__ = [
144251
"medfilt",
145252
"medfilt2d",
146253
"minimum_phase",
147-
"morlet",
148-
"morlet2",
149254
"normalize",
150255
"oaconvolve",
151256
"order_filter",
152257
"peak_prominences",
153258
"peak_widths",
154259
"periodogram",
155260
"place_poles",
156-
"qmf",
157261
"qspline1d",
158262
"qspline1d_eval",
159263
"qspline2d",
@@ -162,7 +266,6 @@ __all__ = [
162266
"resample_poly",
163267
"residue",
164268
"residuez",
165-
"ricker",
166269
"savgol_coeffs",
167270
"savgol_filter",
168271
"sawtooth",

scipy-stubs/signal/_bsplines.pyi

-34
This file was deleted.

scipy-stubs/signal/_filter_design.pyi

+5-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ __all__ = [
2929
"freqs",
3030
"freqs_zpk",
3131
"freqz",
32+
"freqz_sos",
3233
"freqz_zpk",
3334
"gammatone",
3435
"group_delay",
@@ -161,20 +162,22 @@ def group_delay(
161162

162163
#
163164
@overload # worN: real
164-
def sosfreqz(
165+
def freqz_sos(
165166
sos: onp.ToFloat2D,
166167
worN: op.CanIndex | onp.ToFloat1D = 512,
167168
whole: op.CanBool = False,
168169
fs: onp.ToFloat = ..., # 2 * pi
169170
) -> tuple[_Float1D, _Complex1D]: ...
170171
@overload # worN: real
171-
def sosfreqz(
172+
def freqz_sos(
172173
sos: onp.ToFloat2D,
173174
worN: onp.ToComplex1D,
174175
whole: op.CanBool = False,
175176
fs: onp.ToFloat = ..., # 2 * pi
176177
) -> tuple[_Inexact1D, _Complex1D]: ...
177178

179+
sosfreqz = freqz_sos
180+
178181
# TODO(jorenham): https://github.com/jorenham/scipy-stubs/issues/99
179182

180183
def tf2zpk(b: Untyped, a: Untyped) -> Untyped: ...

0 commit comments

Comments
 (0)