Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

TYP: Type MaskedArray.__{ge,gt,le,lt}__ #28689

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 8 commits into from
Apr 15, 2025
Merged

TYP: Type MaskedArray.__{ge,gt,le,lt}__ #28689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dba1b7f
TYP: Type ``MaskedArray.__ge__``
MarcoGorelli Apr 11, 2025
f3302c5
just use ArrayLike for other
MarcoGorelli Apr 14, 2025
925adea
Merge remote-tracking branch 'upstream/main' into ma-ge
MarcoGorelli Apr 14, 2025
5531ce9
:art:
MarcoGorelli Apr 15, 2025
8edcdc0
extra test case
MarcoGorelli Apr 15, 2025
56f8571
remove overload
MarcoGorelli Apr 15, 2025
4174400
remove unnecessary self annotation too
MarcoGorelli Apr 15, 2025
8c6d1f4
gt, le, lt
MarcoGorelli Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions 12 numpy/ma/core.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ from numpy import (
from numpy._globals import _NoValueType
from numpy._typing import (
ArrayLike,
_IntLike_co,
NDArray,
_ArrayLike,
_ArrayLikeInt,
_ArrayLikeInt_co,
_DTypeLikeBool,
_ArrayLikeInt,
_IntLike_co,
_ScalarLike_co,
_Shape,
_ShapeLike,
Expand Down Expand Up @@ -422,10 +422,10 @@ class MaskedArray(ndarray[_ShapeT_co, _DTypeT_co]):
def compress(self, condition, axis=..., out=...): ...
def __eq__(self, other): ...
def __ne__(self, other): ...
def __ge__(self, other): ...
def __gt__(self, other): ...
def __le__(self, other): ...
def __lt__(self, other): ...
def __ge__(self, other: ArrayLike, /) -> _MaskedArray[bool_]: ...
def __gt__(self, other: ArrayLike, /) -> _MaskedArray[bool_]: ...
def __le__(self, other: ArrayLike, /) -> _MaskedArray[bool_]: ...
def __lt__(self, other: ArrayLike, /) -> _MaskedArray[bool_]: ...
def __add__(self, other): ...
def __radd__(self, other): ...
def __sub__(self, other): ...
Expand Down
9 changes: 9 additions & 0 deletions 9 numpy/typing/tests/data/fail/ma.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,12 @@ m.argpartition(axis=(0,1)) # E: No overload variant
m.argpartition(kind='cabbage') # E: No overload variant
m.argpartition(order=lambda: 'cabbage') # E: No overload variant
m.argpartition(AR_b) # E: No overload variant

m >= (lambda x: 'mango') # E: No overload variant

m > (lambda x: 'mango') # E: No overload variant

m <= (lambda x: 'mango') # E: No overload variant

m < (lambda x: 'mango') # E: No overload variant

62 changes: 62 additions & 0 deletions 62 numpy/typing/tests/data/reveal/ma.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ from typing_extensions import assert_type
from typing import Any, TypeAlias, TypeVar
from numpy._typing import _Shape, NDArray
from numpy import dtype, generic
from datetime import datetime, timedelta


_ScalarT_co = TypeVar("_ScalarT_co", bound=generic, covariant=True)
Expand All @@ -11,12 +12,22 @@ MaskedNDArray: TypeAlias = np.ma.MaskedArray[_Shape, dtype[_ScalarT_co]]
class MaskedNDArraySubclass(MaskedNDArray[np.complex128]): ...

AR_f4: NDArray[np.float32]
AR_dt64: NDArray[np.datetime64]
AR_td64: NDArray[np.timedelta64]
AR_o: NDArray[np.timedelta64]

MAR_b: MaskedNDArray[np.bool]
MAR_f4: MaskedNDArray[np.float32]
MAR_f8: MaskedNDArray[np.float64]
MAR_i8: MaskedNDArray[np.int64]
MAR_dt64: MaskedNDArray[np.datetime64]
MAR_td64: MaskedNDArray[np.timedelta64]
MAR_o: MaskedNDArray[np.object_]
MAR_s: MaskedNDArray[np.str_]
MAR_byte: MaskedNDArray[np.bytes_]

MAR_subclass: MaskedNDArraySubclass

MAR_1d: np.ma.MaskedArray[tuple[int], np.dtype[Any]]

f4: np.float32
Expand Down Expand Up @@ -156,3 +167,54 @@ assert_type(MAR_f4.partition(1, axis=0, kind='introselect', order='K'), None)

assert_type(MAR_f4.argpartition(1), MaskedNDArray[np.intp])
assert_type(MAR_1d.argpartition(1, axis=0, kind='introselect', order='K'), MaskedNDArray[np.intp])

assert_type(MAR_f4 >= 3, MaskedNDArray[np.bool])
assert_type(MAR_i8 >= AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_b >= AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_td64 >= AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_dt64 >= AR_dt64, MaskedNDArray[np.bool])
assert_type(MAR_o >= AR_o, MaskedNDArray[np.bool])
assert_type(MAR_1d >= 0, MaskedNDArray[np.bool])
assert_type(MAR_s >= MAR_s, MaskedNDArray[np.bool])
assert_type(MAR_byte >= MAR_byte, MaskedNDArray[np.bool])

assert_type(MAR_f4 > 3, MaskedNDArray[np.bool])
assert_type(MAR_i8 > AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_b > AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_td64 > AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_dt64 > AR_dt64, MaskedNDArray[np.bool])
assert_type(MAR_o > AR_o, MaskedNDArray[np.bool])
assert_type(MAR_1d > 0, MaskedNDArray[np.bool])
assert_type(MAR_s > MAR_s, MaskedNDArray[np.bool])
assert_type(MAR_byte > MAR_byte, MaskedNDArray[np.bool])

assert_type(MAR_f4 <= 3, MaskedNDArray[np.bool])
assert_type(MAR_i8 <= AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_b <= AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_td64 <= AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_dt64 <= AR_dt64, MaskedNDArray[np.bool])
assert_type(MAR_o <= AR_o, MaskedNDArray[np.bool])
assert_type(MAR_1d <= 0, MaskedNDArray[np.bool])
assert_type(MAR_s <= MAR_s, MaskedNDArray[np.bool])
assert_type(MAR_byte <= MAR_byte, MaskedNDArray[np.bool])

assert_type(MAR_f4 < 3, MaskedNDArray[np.bool])
assert_type(MAR_i8 < AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_b < AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_td64 < AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_dt64 < AR_dt64, MaskedNDArray[np.bool])
assert_type(MAR_o < AR_o, MaskedNDArray[np.bool])
assert_type(MAR_1d < 0, MaskedNDArray[np.bool])
assert_type(MAR_s < MAR_s, MaskedNDArray[np.bool])
assert_type(MAR_byte < MAR_byte, MaskedNDArray[np.bool])

assert_type(MAR_f4 <= 3, MaskedNDArray[np.bool])
assert_type(MAR_i8 <= AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_b <= AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_td64 <= AR_td64, MaskedNDArray[np.bool])
assert_type(MAR_dt64 <= AR_dt64, MaskedNDArray[np.bool])
assert_type(MAR_o <= AR_o, MaskedNDArray[np.bool])
assert_type(MAR_1d <= 0, MaskedNDArray[np.bool])
assert_type(MAR_s <= MAR_s, MaskedNDArray[np.bool])
assert_type(MAR_byte <= MAR_byte, MaskedNDArray[np.bool])

Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.