Skip to content

Commit 315b559

Browse files
committed
🏷️ fix stubtest errors in numpy.ma.MaskedArray
1 parent 766ab3e commit 315b559

File tree

2 files changed

+32
-30
lines changed

2 files changed

+32
-30
lines changed

src/numpy-stubs/ma/core.pyi

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from _typeshed import Incomplete
22
from collections.abc import Callable
33
from typing import Any, ClassVar, Final, Generic, Literal as L, type_check_only
4-
from typing_extensions import Never, Self, TypeVar, overload
4+
from typing_extensions import Never, Self, TypeVar, deprecated, overload
55

66
import numpy as np
77
from _numtype import Array, ToGeneric_0d, ToGeneric_1nd, ToGeneric_nd
@@ -343,9 +343,7 @@ class MaskedArray(np.ndarray[_ShapeT_co, _DTypeT_co]):
343343

344344
#
345345
@property
346-
def data(self) -> Incomplete: ...
347-
@data.setter
348-
def data(self, value: Incomplete, /) -> Incomplete: ...
346+
def data(self) -> np.ndarray[_ShapeT_co, _DTypeT_co]: ... # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
349347

350348
#
351349
def get_fill_value(self) -> Incomplete: ...
@@ -368,6 +366,8 @@ class MaskedArray(np.ndarray[_ShapeT_co, _DTypeT_co]):
368366
#
369367
@property
370368
def mT(self) -> Self: ...
369+
@property
370+
def T(self) -> Self: ...
371371

372372
#
373373
def __new__(
@@ -532,42 +532,50 @@ class MaskedArray(np.ndarray[_ShapeT_co, _DTypeT_co]):
532532
def anom(self, axis: Incomplete = ..., dtype: Incomplete = ...) -> Incomplete: ...
533533
def var( # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
534534
self,
535+
/,
535536
axis: Incomplete = ...,
536537
dtype: Incomplete = ...,
537538
out: Incomplete = ...,
538-
ddof: Incomplete = ...,
539+
ddof: float = 0,
539540
keepdims: Incomplete = ...,
541+
mean: Incomplete = ...,
540542
) -> Incomplete: ...
541543
def std( # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
542544
self,
545+
/,
543546
axis: Incomplete = ...,
544547
dtype: Incomplete = ...,
545548
out: Incomplete = ...,
546-
ddof: Incomplete = ...,
549+
ddof: float = 0,
547550
keepdims: Incomplete = ...,
551+
mean: Incomplete = ...,
548552
) -> Incomplete: ...
549553

550554
#
551555
def round(self, decimals: Incomplete = ..., out: Incomplete = ...) -> Incomplete: ... # pyright: ignore[reportIncompatibleMethodOverride]
552556

553557
#
554-
def sort( # pyright: ignore[reportIncompatibleMethodOverride]
558+
def sort( # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
555559
self,
556-
axis: Incomplete = ...,
557-
kind: Incomplete = ...,
558-
order: Incomplete = ...,
559-
endwith: Incomplete = ...,
560-
fill_value: Incomplete = ...,
561-
stable: Incomplete = ...,
560+
/,
561+
axis: Incomplete = -1,
562+
kind: Incomplete | None = None,
563+
order: Incomplete | None = None,
564+
endwith: bool = True,
565+
fill_value: Incomplete | None = None,
566+
*,
567+
stable: bool = False,
562568
) -> Incomplete: ...
563-
def argsort( # pyright: ignore[reportIncompatibleMethodOverride]
569+
def argsort( # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
564570
self,
571+
/,
565572
axis: Incomplete = ...,
566-
kind: Incomplete = ...,
567-
order: Incomplete = ...,
568-
endwith: Incomplete = ...,
569-
fill_value: Incomplete = ...,
570-
stable: Incomplete = ...,
573+
kind: Incomplete | None = None,
574+
order: Incomplete | None = None,
575+
endwith: bool = True,
576+
fill_value: Incomplete | None = None,
577+
*,
578+
stable: bool = False,
571579
) -> Incomplete: ...
572580

573581
#
@@ -636,15 +644,16 @@ class MaskedArray(np.ndarray[_ShapeT_co, _DTypeT_co]):
636644
repeat: Incomplete
637645
squeeze: Incomplete
638646
swapaxes: Incomplete
639-
T: Incomplete
640647
transpose: Incomplete
641648

642649
#
643650
def toflex(self) -> Incomplete: ...
644651
def torecords(self) -> Incomplete: ...
645-
def tolist(self, fill_value: Incomplete = ...) -> Incomplete: ...
646-
def tobytes(self, fill_value: Incomplete = ..., order: Incomplete = ...) -> Incomplete: ... # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
647-
def tofile(self, fid: Incomplete, sep: Incomplete = ..., format: Incomplete = ...) -> Incomplete: ...
652+
def tolist(self, fill_value: Incomplete | None = None) -> Incomplete: ...
653+
@deprecated("tostring() is deprecated. Use tobytes() instead.")
654+
def tostring(self, /, fill_value: Incomplete | None = None, order: _OrderKACF = "C") -> bytes: ... # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
655+
def tobytes(self, /, fill_value: Incomplete | None = None, order: _OrderKACF = "C") -> bytes: ... # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
656+
def tofile(self, /, fid: Incomplete, sep: str = "", format: str = "%s") -> Incomplete: ...
648657

649658
class mvoid(MaskedArray[_ShapeT_co, _DTypeT_co]):
650659
def __new__(

tool/.mypyignore-todo.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ numpy.f2py.symbolic
2222
numpy.f2py.((cb|common|f90mod|use)_)?rules
2323

2424
numpy.ma.testutils
25-
numpy.ma(.core)?.(MaskedArray|masked_array).T
26-
numpy.ma(.core)?.(MaskedArray|masked_array).argsort
27-
numpy.ma(.core)?.(MaskedArray|masked_array).data
28-
numpy.ma(.core)?.(MaskedArray|masked_array).sort
29-
numpy.ma(.core)?.(MaskedArray|masked_array).std
30-
numpy.ma(.core)?.(MaskedArray|masked_array).tostring
31-
numpy.ma(.core)?.(MaskedArray|masked_array).var
3225
numpy.ma(.core)?.alltrue
3326
numpy.ma(.core)?.angle
3427
numpy.ma(.core)?.clip

0 commit comments

Comments
 (0)