8000 TYP: Type masked array shape, dtype, __int__, and __float__ by MarcoGorelli · Pull Request #28591 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

TYP: Type masked array shape, dtype, __int__, and __float__ #28591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 27, 2025
Merged

TYP: Type masked array shape, dtype, __int__, and __float__ #28591

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9606c8
TYP: Type masked array shape, dtype, __int__, and __float__
MarcoGorelli Mar 26, 2025
0e4c94a
make dtype and shape setters positional-only, remove unnecessary __in…
MarcoGorelli Mar 27, 2025
20da8e8
Update numpy/ma/core.pyi
MarcoGorelli Mar 27, 2025
f9d311a
Apply suggestions from code review
MarcoGorelli Mar 27, 2025
File filter

Filter by extension

Filter by extension
8000
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions numpy/ma/core.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,9 @@ __all__ = [
"zeros_like",
]

_ShapeType = TypeVar("_ShapeType", bound=tuple[int, ...])
_ShapeType_co = TypeVar("_ShapeType_co", bound=tuple[int, ...], covariant=True)
_DType = TypeVar("_DType", bound=dtype[Any])
_DType_co = TypeVar("_DType_co", bound=dtype[Any], covariant=True)

MaskType = bool
Expand Down Expand Up @@ -347,13 +349,13 @@ class MaskedArray(ndarray[_ShapeType_co, _DType_co]):
def __getitem__(self, indx): ...
def __setitem__(self, indx, value): ...
@property
def dtype(self): ...
def dtype(self) -> _DType_co: ...
@dtype.setter
def dtype(self, dtype): ...
def dtype(self: MaskedArray[_ShapeType_co, _DType], dtype: _DType) -> None: ...
@property
def shape(self): ...
def shape(self) -> _ShapeType_co: ...
@shape.setter
def shape(self, shape): ...
def shape(self: MaskedArray[_ShapeType, _DType_co], shape: _ShapeType) -> None: ...
def __setmask__(self, mask, copy=...): ...
@property
def mask(self): ...
Expand Down Expand Up @@ -413,8 +415,8 @@ class MaskedArray(ndarray[_ShapeType_co, _DType_co]):
def __ifloordiv__(self, other): ...
def __itruediv__(self, other): ...
def __ipow__(self, other): ...
def __float__(self): ...
def __int__(self): ...
def __float__(self) -> float: ...
def __int__(self) -> int: ...
@property # type: ignore[misc]
def imag(self): ...
get_imag: Any
Expand Down
9 changes: 9 additions & 0 deletions numpy/typing/tests/data/fail/ma.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from typing import Any

import numpy as np
import numpy.ma

m: np.ma.MaskedArray[tuple[int], np.dtype[np.float64]]

m.shape = (3, 1) # E: Incompatible types in assignment
m.dtype = np.bool # E: Incompatible types in assignment
12 changes: 12 additions & 0 deletions numpy/typing/tests/data/reveal/ma.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import numpy as np
from typing_extensions import assert_type


m: np.ma.MaskedArray[tuple[int], np.dtype[np.float64]]

assert_type(m.shape, tuple[int])

assert_type(m.dtype, np.dtype[np.float64])

assert_type(int(m), int)
assert_type(float(m), float)
Loading
0