Skip to content

Commit f94cf36

Browse files
jorenhamjorenham
committed
🤡 sparse: work around the path-dependent pyright bug
1 parent 5595ba6 commit f94cf36

File tree

2 files changed

+54
-54
lines changed

2 files changed

+54
-54
lines changed

‎scipy-stubs/sparse/_csc.pyi

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -106,28 +106,6 @@ class csc_array(_csc_base[_ScalarT_co], sparray[_ScalarT_co, tuple[int, int]], G
106106
*,
107107
maxprint: int | None = None,
108108
) -> None: ...
109-
@overload # 2-D, dtype: <known> (positional)
110-
def __init__(
111-
self,
112-
/,
113-
arg1: _ToAnyCSC,
114-
shape: _ToShape2D | None,
115-
dtype: onp.ToDType[_ScalarT_co],
116-
copy: bool = False,
117-
*,
118-
maxprint: int | None = None,
119-
) -> None: ...
120-
@overload # 2-D, dtype: <known> (keyword)
121-
def __init__(
122-
self,
123-
/,
124-
arg1: _ToAnyCSC,
125-
shape: _ToShape2D | None = None,
126-
*,
127-
dtype: onp.ToDType[_ScalarT_co],
128-
copy: bool = False,
129-
maxprint: int | None = None,
130-
) -> None: ...
131109
@overload # 2-d array-like bool, dtype: bool-like | None
132110
def __init__(
133111
self: csc_array[np.bool_],
@@ -260,6 +238,28 @@ class csc_array(_csc_base[_ScalarT_co], sparray[_ScalarT_co, tuple[int, int]], G
260238
copy: bool = False,
261239
maxprint: int | None = None,
262240
) -> None: ...
241+
@overload # 2-D, dtype: <known> (positional)
242+
def __init__(
243+
self,
244+
/,
245+
arg1: _ToAnyCSC,
246+
shape: _ToShape2D | None,
247+
dtype: onp.ToDType[_ScalarT_co],
248+
copy: bool = False,
249+
*,
250+
maxprint: int | None = None,
251+
) -> None: ...
252+
@overload # 2-D, dtype: <known> (keyword)
253+
def __init__(
254+
self,
255+
/,
256+
arg1: _ToAnyCSC,
257+
shape: _ToShape2D | None = None,
258+
*,
259+
dtype: onp.ToDType[_ScalarT_co],
260+
copy: bool = False,
261+
maxprint: int | None = None,
262+
) -> None: ...
263263

264264
#
265265
@override
@@ -295,28 +295,6 @@ class csc_matrix(_csc_base[_ScalarT_co], spmatrix[_ScalarT_co], Generic[_ScalarT
295295
*,
296296
maxprint: int | None = None,
297297
) -> None: ...
298-
@overload # 2-D, dtype: <known> (positional)
299-
def __init__(
300-
self,
301-
/,
302-
arg1: _ToAnyCSC,
303-
shape: _ToShape2D | None,
304-
dtype: onp.ToDType[_ScalarT_co],
305-
copy: bool = False,
306-
*,
307-
maxprint: int | None = None,
308-
) -> None: ...
309-
@overload # 2-D, dtype: <known> (keyword)
310-
def __init__(
311-
self,
312-
/,
313-
arg1: _ToAnyCSC,
314-
shape: _ToShape2D | None = None,
315-
*,
316-
dtype: onp.ToDType[_ScalarT_co],
317-
copy: bool = False,
318-
maxprint: int | None = None,
319-
) -> None: ...
320298
@overload # 2-d array-like bool, dtype: bool-like | None
321299
def __init__(
322300
self: csc_matrix[np.bool_],
@@ -449,6 +427,28 @@ class csc_matrix(_csc_base[_ScalarT_co], spmatrix[_ScalarT_co], Generic[_ScalarT
449427
copy: bool = False,
450428
maxprint: int | None = None,
451429
) -> None: ...
430+
@overload # 2-D, dtype: <known> (positional)
431+
def __init__(
432+
self,
433+
/,
434+
arg1: _ToAnyCSC,
435+
shape: _ToShape2D | None,
436+
dtype: onp.ToDType[_ScalarT_co],
437+
copy: bool = False,
438+
*,
439+
maxprint: int | None = None,
440+
) -> None: ...
441+
@overload # 2-D, dtype: <known> (keyword)
442+
def __init__(
443+
self,
444+
/,
445+
arg1: _ToAnyCSC,
446+
shape: _ToShape2D | None = None,
447+
*,
448+
dtype: onp.ToDType[_ScalarT_co],
449+
copy: bool = False,
450+
maxprint: int | None = None,
451+
) -> None: ...
452452

453453
#
454454
@override

‎tests/sparse/test_csc.pyi

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import numpy as np
66
from ._types import ScalarType, csr_arr, csr_mat
77
from scipy.sparse import csc_array, csc_matrix
88

9-
scalartype: ScalarType
9+
dtype: np.dtype[ScalarType]
1010

1111
shape2: tuple[int, int]
1212

@@ -29,7 +29,7 @@ csc_spec3: tuple[
2929

3030
# csc_matrix(D)
3131
assert_type(csc_matrix(data2), csc_matrix[ScalarType])
32-
assert_type(csc_matrix(data2, dtype=scalartype), csc_matrix[ScalarType])
32+
assert_type(csc_matrix(data2, dtype=dtype), csc_matrix[ScalarType])
3333
assert_type(csc_matrix(data2, dtype=bool), csc_matrix[np.bool_])
3434
assert_type(csc_matrix(data2, dtype=int), csc_matrix[np.int_])
3535
assert_type(csc_matrix(data2, dtype=float), csc_matrix[np.float64])
@@ -41,7 +41,7 @@ assert_type(csc_matrix(csr_mat), csc_matrix[ScalarType])
4141

4242
# csc_matrix((M, N), [dtype])
4343
assert_type(csc_matrix(shape2), csc_matrix[np.float64])
44-
assert_type(csc_matrix(shape2, dtype=scalartype), csc_matrix[ScalarType])
44+
assert_type(csc_matrix(shape2, dtype=dtype), csc_matrix[ScalarType])
4545
assert_type(csc_matrix(shape2, dtype=bool), csc_matrix[np.bool_])
4646
assert_type(csc_matrix(shape2, dtype=int), csc_matrix[np.int_])
4747
assert_type(csc_matrix(shape2, dtype=float), csc_matrix[np.float64])
@@ -52,7 +52,7 @@ assert_type(csc_matrix(csc_spec2), csc_matrix[ScalarType])
5252
assert_type(csc_matrix(csc_spec2, shape2), csc_matrix[ScalarType])
5353
assert_type(csc_matrix(csc_spec2, shape=shape2), csc_matrix[ScalarType])
5454

55-
assert_type(csc_matrix(csc_spec2, dtype=scalartype), csc_matrix[ScalarType])
55+
assert_type(csc_matrix(csc_spec2, dtype=dtype), csc_matrix[ScalarType])
5656
assert_type(csc_matrix(csc_spec2, dtype=bool), csc_matrix[np.bool_])
5757
assert_type(csc_matrix(csc_spec2, dtype=int), csc_matrix[np.int_])
5858
assert_type(csc_matrix(csc_spec2, dtype=float), csc_matrix[np.float64])
@@ -64,7 +64,7 @@ assert_type(csc_matrix(csc_spec3), csc_matrix[ScalarType]) # type: ignore[asser
6464
assert_type(csc_matrix(csc_spec3, shape2), csc_matrix[ScalarType]) # type: ignore[assert-type]
6565
assert_type(csc_matrix(csc_spec3, shape=shape2), csc_matrix[ScalarType]) # type: ignore[assert-type]
6666

67-
assert_type(csc_matrix(csc_spec3, dtype=scalartype), csc_matrix[ScalarType])
67+
assert_type(csc_matrix(csc_spec3, dtype=dtype), csc_matrix[ScalarType])
6868
assert_type(csc_matrix(csc_spec3, dtype=bool), csc_matrix[np.bool_])
6969
assert_type(csc_matrix(csc_spec3, dtype=int), csc_matrix[np.int_])
7070
assert_type(csc_matrix(csc_spec3, dtype=float), csc_matrix[np.float64])
@@ -75,19 +75,19 @@ assert_type(csc_matrix(csc_spec3, dtype=complex), csc_matrix[np.complex128])
7575

7676
# csc_array(D)
7777
assert_type(csc_array(data2), csc_array[ScalarType])
78-
assert_type(csc_array(data2, dtype=scalartype), csc_array[ScalarType])
78+
assert_type(csc_array(data2, dtype=dtype), csc_array[ScalarType])
7979
assert_type(csc_array(data2, dtype=bool), csc_array[np.bool_])
8080
assert_type(csc_array(data2, dtype=int), csc_array[np.int_])
8181
assert_type(csc_array(data2, dtype=float), csc_array[np.float64])
8282
assert_type(csc_array(data2, dtype=complex), csc_array[np.complex128])
8383

84-
# csc_matrix(S)
84+
# csc_array(S)
8585
assert_type(csc_array(csr_arr), csc_array[ScalarType])
8686
assert_type(csc_array(csr_mat), csc_array[ScalarType])
8787

8888
# csc_array((M, N), [dtype])
8989
assert_type(csc_array(shape2), csc_array[np.float64])
90-
assert_type(csc_array(shape2, dtype=scalartype), csc_array[ScalarType])
90+
assert_type(csc_array(shape2, dtype=dtype), csc_array[ScalarType])
9191
assert_type(csc_array(shape2, dtype=bool), csc_array[np.bool_])
9292
assert_type(csc_array(shape2, dtype=int), csc_array[np.int_])
9393
assert_type(csc_array(shape2, dtype=float), csc_array[np.float64])
@@ -98,7 +98,7 @@ assert_type(csc_array(csc_spec2), csc_array[ScalarType])
9898
assert_type(csc_array(csc_spec2, shape2), csc_array[ScalarType])
9999
assert_type(csc_array(csc_spec2, shape=shape2), csc_array[ScalarType])
100100

101-
assert_type(csc_array(csc_spec2, dtype=scalartype), csc_array[ScalarType])
101+
assert_type(csc_array(csc_spec2, dtype=dtype), csc_array[ScalarType])
102102
assert_type(csc_array(csc_spec2, dtype=bool), csc_array[np.bool_])
103103
assert_type(csc_array(csc_spec2, dtype=int), csc_array[np.int_])
104104
assert_type(csc_array(csc_spec2, dtype=float), csc_array[np.float64])
@@ -110,7 +110,7 @@ assert_type(csc_array(csc_spec3), csc_array[ScalarType]) # type: ignore[assert-
110110
assert_type(csc_array(csc_spec3, shape2), csc_array[ScalarType]) # type: ignore[assert-type]
111111
assert_type(csc_array(csc_spec3, shape=shape2), csc_array[ScalarType]) # type: ignore[assert-type]
112112

113-
assert_type(csc_array(csc_spec3, dtype=scalartype), csc_array[ScalarType])
113+
assert_type(csc_array(csc_spec3, dtype=dtype), csc_array[ScalarType])
114114
assert_type(csc_array(csc_spec3, dtype=bool), csc_array[np.bool_])
115115
assert_type(csc_array(csc_spec3, dtype=int), csc_array[np.int_])
116116
assert_type(csc_array(csc_spec3, dtype=float), csc_array[np.float64])

0 commit comments

Comments
 (0)