Skip to content

Commit 0838b05

Browse files
jorenhamjorenham
committed
🩹 fix remaining AnyDTypeFloat664 = None cases
1 parent f2e7824 commit 0838b05

File tree

2 files changed

+39
-25
lines changed

2 files changed

+39
-25
lines changed

‎scipy-stubs/sparse/_construct.pyi

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ class _DataSampler(Protocol):
8686

8787
###
8888

89-
# NOTE: The `overload-overlap` mypy errors are false positives.
9089
@overload # diagonals: <known>, dtype: None = ..., format: {"dia", None} = ...
91-
def diags_array( # type: ignore[overload-overlap]
90+
def diags_array(
9291
diagonals: _ToArray1D[_SCT] | _ToArray2D[_SCT],
9392
/,
9493
*,
@@ -739,7 +738,7 @@ def random_array(
739738
*,
740739
density: float | npc.floating = 0.01,
741740
format: _FmtCOO = "coo",
742-
dtype: onp.AnyFloat64DType = None,
741+
dtype: onp.AnyFloat64DType | None = None,
743742
rng: onp.random.ToRNG | None = None,
744743
random_state: onp.random.ToRNG | None = None,
745744
data_sampler: _DataSampler | None = None,
@@ -783,7 +782,7 @@ def random_array(
783782
*,
784783
density: float | npc.floating = 0.01,
785784
format: _Format = "coo",
786-
dtype: onp.AnyFloat64DType = None,
785+
dtype: onp.AnyFloat64DType | None = None,
787786
rng: onp.random.ToRNG | None = None,
788787
random_state: onp.random.ToRNG | None = None,
789788
data_sampler: _DataSampler | None = None,
@@ -794,7 +793,7 @@ def random_array(
794793
*,
795794
density: float | npc.floating = 0.01,
796795
format: _Format = "coo",
797-
dtype: onp.AnyFloat64DType = None,
796+
dtype: onp.AnyFloat64DType | None = None,
798797
rng: onp.random.ToRNG | None = None,
799798
random_state: onp.random.ToRNG | None = None,
800799
data_sampler: _DataSampler | None = None,
@@ -873,7 +872,7 @@ def random(
873872
n: opt.AnyInt,
874873
density: float | npc.floating = 0.01,
875874
format: _FmtCOO = "coo",
876-
dtype: onp.AnyFloat64DType = None,
875+
dtype: onp.AnyFloat64DType | None = None,
877876
rng: onp.random.ToRNG | None = None,
878877
data_rvs: _DataRVS | None = None,
879878
*,
@@ -945,7 +944,7 @@ def random(
945944
n: opt.AnyInt,
946945
density: float | npc.floating = 0.01,
947946
format: _Format = ...,
948-
dtype: onp.AnyFloat64DType = None,
947+
dtype: onp.AnyFloat64DType | None = None,
949948
rng: onp.random.ToRNG | None = None,
950949
data_rvs: _DataRVS | None = None,
951950
*,
@@ -1019,7 +1018,7 @@ def rand(
10191018
n: opt.AnyInt,
10201019
density: float | npc.floating = 0.01,
10211020
format: _FmtCOO = "coo",
1022-
dtype: onp.AnyFloat64DType = None,
1021+
dtype: onp.AnyFloat64DType | None = None,
10231022
rng: onp.random.ToRNG | None = None,
10241023
*,
10251024
random_state: onp.random.ToRNG | None = None,
@@ -1074,7 +1073,7 @@ def rand(
10741073
n: opt.AnyInt,
10751074
density: float | npc.floating = 0.01,
10761075
format: _Format = "coo",
1077-
dtype: onp.AnyFloat64DType = None,
1076+
dtype: onp.AnyFloat64DType | None = None,
10781077
rng: onp.random.ToRNG | None = None,
10791078
*,
10801079
random_state: onp.random.ToRNG | None = None,

‎scipy-stubs/special/_ufuncs.pyi

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,12 @@ class _UFunc21f(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identity
10671067
#
10681068
@override
10691069
def accumulate(
1070-
self, /, array: onp.ToFloat64_ND, axis: op.CanIndex = 0, dtype: _ToDType_fd = None, out: _Out1[_FloatND | None] = None
1070+
self,
1071+
/,
1072+
array: onp.ToFloat64_ND,
1073+
axis: op.CanIndex = 0,
1074+
dtype: _ToDType_fd | None = None,
1075+
out: _Out1[_FloatND | None] = None,
10711076
) -> _FloatND: ...
10721077
#
10731078
@overload
@@ -1076,7 +1081,7 @@ class _UFunc21f(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identity
10761081
/,
10771082
array: onp.ToFloat64_ND,
10781083
axis: None,
1079-
dtype: _ToDType_fd = None,
1084+
dtype: _ToDType_fd | None = None,
10801085
out: _Out1 = None,
10811086
keepdims: onp.ToFalse = False,
10821087
initial: onp.ToFloat64 = ...,
@@ -1088,7 +1093,7 @@ class _UFunc21f(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identity
10881093
/,
10891094
array: onp.ToFloat64_ND,
10901095
axis: _Axis = 0,
1091-
dtype: _ToDType_fd = None,
1096+
dtype: _ToDType_fd | None = None,
10921097
out: _Out1 = None,
10931098
keepdims: onp.ToFalse = False,
10941099
initial: onp.ToFloat64 = ...,
@@ -1100,7 +1105,7 @@ class _UFunc21f(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identity
11001105
/,
11011106
array: onp.ToFloat64_ND,
11021107
axis: _Axis = 0,
1103-
dtype: _ToDType_fd = None,
1108+
dtype: _ToDType_fd | None = None,
11041109
out: _Out1 = None,
11051110
*,
11061111
keepdims: onp.ToTrue,
@@ -1125,7 +1130,7 @@ class _UFunc21f(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identity
11251130
/,
11261131
array: onp.ToFloat64_ND,
11271132
axis: _Axis = 0,
1128-
dtype: _ToDType_fd = None,
1133+
dtype: _ToDType_fd | None = None,
11291134
*,
11301135
out: _Out1[_OutT],
11311136
keepdims: bool = False,
@@ -1140,7 +1145,7 @@ class _UFunc21f(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identity
11401145
array: onp.ToFloat64_ND,
11411146
indices: _Indices,
11421147
axis: op.CanIndex = 0,
1143-
dtype: _ToDType_fd = None,
1148+
dtype: _ToDType_fd | None = None,
11441149
out: _Out1[_FloatND | None] = None,
11451150
) -> _FloatND: ...
11461151
#
@@ -1223,7 +1228,12 @@ class _UFunc21fc1(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identi
12231228
#
12241229
@override
12251230
def accumulate(
1226-
self, /, array: onp.ToFloat64_ND, axis: op.CanIndex = 0, dtype: _ToDType_fd = None, out: _Out1[_FloatND | None] = None
1231+
self,
1232+
/,
1233+
array: onp.ToFloat64_ND,
1234+
axis: op.CanIndex = 0,
1235+
dtype: _ToDType_fd | None = None,
1236+
out: _Out1[_FloatND | None] = None,
12271237
) -> _FloatND: ...
12281238
#
12291239
@overload
@@ -1232,7 +1242,7 @@ class _UFunc21fc1(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identi
12321242
/,
12331243
array: onp.ToFloat64_ND,
12341244
axis: None,
1235-
dtype: _ToDType_fd = None,
1245+
dtype: _ToDType_fd | None = None,
12361246
out: _Out1 = None,
12371247
keepdims: onp.ToFalse = False,
12381248
initial: onp.ToFloat64 = ...,
@@ -1244,7 +1254,7 @@ class _UFunc21fc1(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identi
12441254
/,
12451255
array: onp.ToFloat64_ND,
12461256
axis: _Axis = 0,
1247-
dtype: _ToDType_fd = None,
1257+
dtype: _ToDType_fd | None = None,
12481258
out: _Out1 = None,
12491259
keepdims: onp.ToFalse = False,
12501260
initial: onp.ToFloat64 = ...,
@@ -1256,7 +1266,7 @@ class _UFunc21fc1(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identi
12561266
/,
12571267
array: onp.ToFloat64_ND,
12581268
axis: _Axis = 0,
1259-
dtype: _ToDType_fd = None,
1269+
dtype: _ToDType_fd | None = None,
12601270
out: _Out1 = None,
12611271
*,
12621272
keepdims: onp.ToTrue,
@@ -1281,7 +1291,7 @@ class _UFunc21fc1(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identi
12811291
/,
12821292
array: onp.ToFloat64_ND,
12831293
axis: _Axis = 0,
1284-
dtype: _ToDType_fd = None,
1294+
dtype: _ToDType_fd | None = None,
12851295
*,
12861296
out: _Out1[_OutT],
12871297
keepdims: bool = False,
@@ -1296,7 +1306,7 @@ class _UFunc21fc1(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identi
12961306
array: onp.ToFloat64_ND,
12971307
indices: _Indices,
12981308
axis: op.CanIndex = 0,
1299-
dtype: _ToDType_fd = None,
1309+
dtype: _ToDType_fd | None = None,
13001310
out: _Out1[_FloatND | None] = None,
13011311
) -> _FloatND: ...
13021312
#
@@ -1351,7 +1361,12 @@ class _UFunc21fc2(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identi
13511361
#
13521362
@overload
13531363
def accumulate(
1354-
self, /, array: onp.ToFloat64_ND, axis: op.CanIndex = 0, dtype: _ToDType_fd = None, out: _Out1[_FloatND | None] = None
1364+
self,
1365+
/,
1366+
array: onp.ToFloat64_ND,
1367+
axis: op.CanIndex = 0,
1368+
dtype: _ToDType_fd | None = None,
1369+
out: _Out1[_FloatND | None] = None,
13551370
) -> _FloatND: ...
13561371
@overload
13571372
def accumulate(
@@ -1369,7 +1384,7 @@ class _UFunc21fc2(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identi
13691384
/,
13701385
array: onp.ToFloat64_ND,
13711386
axis: None,
1372-
dtype: _ToDType_fd = None,
1387+
dtype: _ToDType_fd | None = None,
13731388
out: _Out1 = None,
13741389
keepdims: onp.ToFalse = False,
13751390
initial: onp.ToFloat = ...,
@@ -1381,7 +1396,7 @@ class _UFunc21fc2(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identi
13811396
/,
13821397
array: onp.ToFloat64_ND,
13831398
axis: _Axis = 0,
1384-
dtype: _ToDType_fd = None,
1399+
dtype: _ToDType_fd | None = None,
13851400
out: _Out1 = None,
13861401
*,
13871402
keepdims: onp.ToTrue,
@@ -1458,7 +1473,7 @@ class _UFunc21fc2(_UFunc21[_NameT_co, _IdentityT_co], Generic[_NameT_co, _Identi
14581473
array: onp.ToFloat64_ND,
14591474
indices: _Indices,
14601475
axis: op.CanIndex = 0,
1461-
dtype: _ToDType_fd = None,
1476+
dtype: _ToDType_fd | None = None,
14621477
out: _Out1[_FloatND | None] = None,
14631478
) -> _FloatND: ...
14641479
@overload

0 commit comments

Comments
 (0)