Skip to content

Commit b1da0b1

Browse files
jorenhamjorenham
authored
Merge pull request #1503 from scipy/mypy-1.20.0
2 parents 41bc8c8 + 2a29196 commit b1da0b1

5 files changed

Lines changed: 194 additions & 257 deletions

File tree

‎.mypyignore‎

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -17,92 +17,3 @@ scipy\.special\._precompute\..*
1717

1818
# useless __new__
1919
scipy\.stats\.(_new_distributions\.)?Normal\.__new__
20-
21-
# these require numtype to be released
22-
scipy\.stats\._qmvnt\.phi(nv)?
23-
scipy\.special\._basic\.digamma
24-
scipy\.special\._ufuncs\._(hypergeom|n?binom)_(pm|cd|pp|i?s)f
25-
scipy\.special\._ufuncs\._(hypergeom|nbinom|nc(f|t))_(mean|variance|skewness|kurtosis_excess)
26-
scipy\.special\._ufuncs\._(beta|cauchy|invgauss|landau|nc(f|t|x2)|skewnorm)_(pd|cd|pp|i?s)f
27-
scipy\.special\._ufuncs\._cosine_(inv)?cdf
28-
scipy\.special\._ufuncs\._(cos|sin)pi
29-
scipy\.special\._ufuncs\._factorial
30-
scipy\.special\._ufuncs\._igam_fac
31-
scipy\.special\._ufuncs\._lgam1p
32-
scipy\.special\._ufuncs\._log1pmx
33-
scipy\.special\._ufuncs\._stirling2_inexact
34-
scipy\.special\._ufuncs\._scaled_exp1
35-
scipy\.special\._ufuncs\._lanczos_sum_expg_scaled
36-
scipy\.special\._ufuncs\._iv_ratio(_c)?
37-
scipy\.special\._ufuncs\._(kolmog|smirnov)(ci?|p)
38-
scipy\.special\._ufuncs\._riemann_zeta
39-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?agm
40-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?beta(ln|incc?(inv)?)?
41-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?binom
42-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?poch
43-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(inv_)?boxcox(1p)?
44-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?cbrt(r(c|iv?)?)?
45-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(cos|sin|tan|cot)dg
46-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(cos|pow|exp)m1
47-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?sici
48-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?shichi
49-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?ellip((e|k)(inc)?|km1|r(c|d|f|g|j)|j)
50-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?erf(c(inv|x)?|i(nv)?)?
51-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?eval_(cheby(c|s)|hermite(norm)?|(gen)?laguerre|gegenbauer)
52-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?eval_(sh_)?(cheby(t|u)|legendre|jacobi)
53-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?lpmv
54-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?exp(10?|2|i|n|rel)
55-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(exp|log|log_exp)it
56-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?log1p
57-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?xlog(1p)?y
58-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(di|log|r)?gamma
59-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?gamma(incc?(inv)?|ln|sgn)?
60-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(pseudo_)?huber
61-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?hyp((0|1|2)f1|eru)
62-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?be(i|r)p?
63-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(i|k)(0|1|v)e?
64-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(mod)?struve
65-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?it(2|mod)?struve0
66-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?it2?(i0k|j0y)0
67-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(j|y)(0|1|n|ve?)
68-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?k(e(i|r)p?|n)
69-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?fresnel
70-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?modfresnel(m|p)
71-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?mathieu_(c|s)em
72-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?mathieu_mod(c|s)em(1|2)
73-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(rel_)?entr
74-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?kl_div
75-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?mathieu_(a|b)
76-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?hankel(1|2)e?
77-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(obl|pro)_(cv|ang1(_cv)?|rad(1|2)(_cv)?)
78-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(it)?airye?
79-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?kelvin
80-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?owens_t
81-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?pb(dv|vv|wa)
82-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?psi
83-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?radian
84-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?round
85-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?kolmog(i|orov)
86-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?smirnovi?
87-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?spence
88-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?tklmbda
89-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?voigt_profile
90-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?dawsn
91-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?wofz
92-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?besselpoly
93-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(log_)?wright_bessel
94-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?wrightomega
95-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?zetac
96-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?bdtr(c|i(k|n)?)?
97-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?btdtri(a|b)
98-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?chdtr(c|iv?)?
99-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?chndtr(i(df|nc|x))?
100-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?fdtr(c|i(dfd)?)?
101-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?gdtr(c|i(a|b|x))?
102-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?nbdtr(c|i(k|n)?)?
103-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?ncfdtr(i((nc)?|df(d|n)))?
104-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?nctdtr(i(df|nc|t))?
105-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?(log_)?ndtr(i(_exp)?)?
106-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?nrdtri(mn|sd)
107-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?pdtr(c|ik?)?
108-
scipy\.special\.(_support_alternative_backends\.|(_special)?_ufuncs\.)?stdtr(i(df|t))?

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ type = [
6363
"pytest==9.0.2", # needed for `_lib._array_api.make_xp_pytest_*`
6464
"matplotlib==3.10.8", # needed for `spatial._plotutils` and `stats._fit.FitResult.plot`
6565
"basedpyright==1.38.4",
66-
"mypy[faster-cache]==1.19.1",
66+
"mypy[faster-cache]==1.20.0",
6767
"pyrefly==0.58.0",
6868
"stubdefaulter>=0.1.0",
6969
"ty==0.0.26",

‎scipy-stubs/constants/_constants.pyi‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ _TempScale: TypeAlias = Literal[_TempScaleC, _TempScaleK, _TempScaleF, _TempScal
178178
# mathematical constants
179179
pi: Final = 3.141592653589793
180180
golden: Final = 1.618033988749895
181-
golden_ratio: Final = 1.618033988749895
181+
golden_ratio: Final = golden
182182

183183
# SI prefixes
184184
quetta: Final = 1e30
@@ -217,66 +217,66 @@ zebi: Final[int] = ... # 0x40_0000_0000_0000_0000
217217
yobi: Final[int] = ... # 0x1_0000_0000_0000_0000_0000
218218

219219
# physical constants
220-
c: Final = 299792458.0
221-
speed_of_light: Final = 299792458.0
222-
mu_0: Final = 1.25663706212e-6
223-
epsilon_0: Final = 8.8541878128e-12
220+
c: Final = 299_792_458.0
221+
speed_of_light: Final = c
222+
mu_0: Final = 1.25663706127e-6
223+
epsilon_0: Final = 8.8541878188e-12
224224
h: Final = 6.62607015e-34
225-
Planck: Final = 6.62607015e-34
225+
Planck: Final = h
226226
hbar: Final = 1.0545718176461565e-34
227227
G: Final = 6.6743e-11
228-
gravitational_constant: Final = 6.6743e-11
228+
gravitational_constant: Final = G
229229
g: Final = 9.80665
230230
e: Final = 1.602176634e-19
231-
elementary_charge: Final = 1.602176634e-19
232-
R: Final = 8.314462618
233-
gas_constant: Final = 8.314462618
234-
alpha: Final = 0.0072973525693
235-
fine_structure: Final = 0.0072973525693
231+
elementary_charge: Final = e
232+
R: Final = 8.31446261815324
233+
gas_constant: Final = R
234+
alpha: Final = 0.0072973525643
235+
fine_structure: Final = alpha
236236
N_A: Final = 6.02214076e23
237-
Avogadro: Final = 6.02214076e23
237+
Avogadro: Final = N_A
238238
k: Final = 1.380649e-23
239-
Boltzmann: Final = 1.380649e-23
240-
sigma: Final = 5.670374419e-8
241-
Stefan_Boltzmann: Final = 5.670374419e-8
242-
Wien: Final = 0.002897771955
243-
Rydberg: Final = 10973731.56816
239+
Boltzmann: Final = k
240+
sigma: Final = 5.6703744191844314e-8
241+
Stefan_Boltzmann: Final = sigma
242+
Wien: Final = 0.0028977719551851727
243+
Rydberg: Final = 10_973_731.568157
244244

245245
# mass in kg
246246
gram: Final = 1e-3
247247
metric_ton: Final = 1e3
248248
# legacy mass units
249249
grain: Final = 6.479891e-5
250-
lb: Final = 0.45359237
251-
pound: Final = 0.45359237
250+
lb: Final = 0.45359236999999997
251+
pound: Final = lb
252252
blob: Final = 175.12683524647636
253-
slinch: Final = 175.12683524647636
253+
slinch: Final = blob
254254
slug: Final = 14.593902937206364
255-
oz: Final = 0.028349523125
256-
ounce: Final = 0.028349523124
257-
stone: Final = 6.35029318
255+
oz: Final = 0.028349523124999998
256+
ounce: Final = oz
257+
stone: Final = 6.3502931799999995
258258
long_ton: Final = 1.0160469088e3
259-
short_ton: Final = 907.18474
260-
troy_ounce: Final = 0.0311034768
261-
troy_pound: Final = 0.3732417216
259+
short_ton: Final = 907.1847399999999
260+
troy_ounce: Final = 0.031103476799999998
261+
troy_pound: Final = 0.37324172159999996
262262
carat: Final = 2e-4
263263
# fundamental masses
264-
m_e: Final = 9.1093837015e-31
265-
electron_mass: Final = 9.1093837015e-31
266-
m_p: Final = 1.67262192369e-27
267-
proton_mass: Final = 1.67262192369e-27
268-
m_n: Final = 1.67492749804e-27
269-
neutron_mass: Final = 1.67492749804e-27
270-
m_u: Final = 1.6605390666e-27
271-
u: Final = 1.6605390666e-27
272-
atomic_mass: Final = 1.6605390666e-27
264+
m_e: Final = 9.1093837139e-31
265+
electron_mass: Final = m_e
266+
m_p: Final = 1.67262192595e-27
267+
proton_mass: Final = m_p
268+
m_n: Final = 1.67492750056e-27
269+
neutron_mass: Final = m_n
270+
m_u: Final = 1.66053906892e-27
271+
u: Final = m_u
272+
atomic_mass: Final = m_u
273273

274274
# angle in rad
275275
degree: Final = 0.017453292519943295
276276
arcmin: Final = 2.908882086657216e-4
277-
arcminute: Final = 2.908882086657216e-4
277+
arcminute: Final = arcmin
278278
arcsec: Final = 4.84813681109536e-6
279-
arcsecond: Final = 4.84813681109536e-6
279+
arcsecond: Final = arcsec
280280

281281
# time in second
282282
minute: Final = 60.0
@@ -288,81 +288,81 @@ Julian_year: Final = 31_557_600.0
288288

289289
# length in meter
290290
inch: Final = 0.0254
291-
foot: Final = 0.3048
292-
yard: Final = 0.9144
293-
mile: Final = 1_609.344
294-
mil: Final = 2.54e-5
295-
pt: Final = 3.527777777777778e-4
296-
point: Final = 3.527777777777778e-4
291+
foot: Final = 0.30479999999999996
292+
yard: Final = 0.9143999999999999
293+
mile: Final = 1_609.3439999999998
294+
mil: Final = 2.5399999999999997e-5
295+
pt: Final = 0.00035277777777777776
296+
point: Final = pt
297297
survey_foot: Final = 0.3048006096012192
298298
survey_mile: Final = 1_609.3472186944373
299299
nautical_mile: Final = 1_852.0
300300
fermi: Final = 1e-15
301301
angstrom: Final = 1e-10
302302
micron: Final = 1e-6
303303
au: Final = 149_597_870_700.0
304-
astronomical_unit: Final = 149_597_870_700.0
304+
astronomical_unit: Final = au
305305
light_year: Final = 9.460730472580800e15
306306
parsec: Final = 3.085677581491367e16
307307

308308
# pressure in pascal
309309
bar: Final = 100_000.0
310310
atm: Final = 101_325.0
311-
atmosphere: Final = 101_325.0
311+
atmosphere: Final = atm
312312
torr: Final = 133.32236842105263
313-
mmHg: Final = 133.32236842105263
313+
mmHg: Final = torr
314314
psi: Final = 6_894.757293168361
315315

316316
# area in meter**2
317317
hectare: Final = 10_000.0
318-
acre: Final = 4_046.8564224
318+
acre: Final = 4_046.8564223999992
319319

320320
# volume in meter**3
321321
litre: Final = 1e-3
322-
liter: Final = 1e-3
323-
gallon: Final = 3.785411784e-3
324-
gallon_US: Final = 3.785411784e-3
325-
fluid_ounce: Final = 2.95735295625e-5
326-
fluid_ounce_US: Final = 2.95735295625e-5
327-
bbl: Final = 0.158987294928
328-
barrel: Final = 0.158987294928
322+
liter: Final = litre
323+
gallon: Final = 0.0037854117839999997
324+
gallon_US: Final = gallon
325+
fluid_ounce: Final = 2.9573529562499998e-5
326+
fluid_ounce_US: Final = fluid_ounce
327+
bbl: Final = 0.15898729492799998
328+
barrel: Final = bbl
329329
gallon_imp: Final = 4.54609e-3
330330
fluid_ounce_imp: Final = 2.84130625e-5
331331

332332
# speed in meter per second
333333
kmh: Final = 0.27777777777777777
334-
mph: Final = 0.44704
334+
mph: Final = 0.44703999999999994
335335
mach: Final = 340.5
336-
speed_of_sound: Final = 340.5
337-
knot: Final = 0.5144444444444444
336+
speed_of_sound: Final = mach
337+
knot: Final = 0.5144444444444445
338338

339339
# temperature in kelvin
340340
zero_Celsius: Final = 273.15
341341
degree_Fahrenheit: Final = 0.55555555555555555
342342

343343
# energy in joule
344344
eV: Final = 1.602176634e-19
345-
electron_volt: Final = 1.602176634e-19
345+
electron_volt: Final = eV
346346
calorie: Final = 4.184
347-
calorie_th: Final = 4.184
347+
calorie_th: Final = calorie
348348
calorie_IT: Final = 4.1868
349349
erg: Final = 1e-7
350350
Btu_th: Final = 1_054.3502644888888
351351
Btu: Final = 1_055.05585262
352-
Btu_IT: Final = 1_055.05585262
352+
Btu_IT: Final = Btu
353353
ton_TNT: Final = 4.184e9
354354

355355
# power in watt
356356
hp: Final = 745.6998715822701
357-
horsepower: Final = 745.6998715822701
357+
horsepower: Final = hp
358358

359359
# force in newton
360360
dyn: Final = 1e-5
361-
dyne: Final = 1e-5
361+
dyne: Final = dyn
362362
lbf: Final = 4.4482216152605
363-
pound_force: Final = 4.4482216152605
363+
pound_force: Final = lbf
364364
kgf: Final = 9.80665
365-
kilogram_force: Final = 9.80665
365+
kilogram_force: Final = kgf
366366

367367
@overload
368368
def convert_temperature(val: _InexactArrayLikeT, old_scale: _TempScale, new_scale: _TempScale) -> _InexactArrayLikeT: ...

‎scipy-stubs/sparse/linalg/_interface.pyi‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,22 @@ class LinearOperator(Generic[_SCT_co]):
267267
def __matmul__(self, /, x: onp.ToFloatND) -> onp.ArrayND[_SCT_co]: ...
268268
@overload
269269
def __matmul__(self, /, x: onp.ToComplexND) -> onp.ArrayND[Any]: ...
270-
__rmatmul__ = __matmul__
270+
271+
#
272+
@overload
273+
def __rmatmul__(self, /, x: LinearOperator[_SCT]) -> _ProductLinearOperator[_SCT_co, _SCT]: ...
274+
@overload
275+
def __rmatmul__(self, /, x: onp.ToFloatStrict1D) -> onp.Array1D[_SCT_co]: ...
276+
@overload
277+
def __rmatmul__(self, /, x: onp.ToJustComplex128Strict1D) -> onp.Array1D[np.complex128]: ...
278+
@overload
279+
def __rmatmul__(self, /, x: onp.ToFloatStrict2D) -> onp.Array2D[_SCT_co]: ...
280+
@overload
281+
def __rmatmul__(self, /, x: onp.ToJustComplex128Strict2D) -> onp.Array2D[np.complex128]: ...
282+
@overload
283+
def __rmatmul__(self, /, x: onp.ToFloatND) -> onp.ArrayND[_SCT_co]: ...
284+
@overload
285+
def __rmatmul__(self, /, x: onp.ToComplexND) -> onp.ArrayND[Any]: ...
271286

272287
#
273288
@overload

0 commit comments

Comments
 (0)