Skip to content
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

Update signature for _arrayfunction.__array__ #9237

Merged
merged 19 commits into from
Jul 21, 2024
Merged

Update signature for _arrayfunction.__array__ #9237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ac6fc13
Update test_namedarray.py
Illviljan Jul 11, 2024
b51f168
Merge branch 'main' into namedarray_typing_np2
Illviljan Jul 11, 2024
184c211
Update _typing.py
Illviljan Jul 11, 2024
eee5cd3
Merge branch 'main' into namedarray_typing_np2
max-sixty Jul 13, 2024
8b649cd
Update test_namedarray.py
Illviljan Jul 16, 2024
bf09e92
Merge branch 'main' into namedarray_typing_np2
Illviljan Jul 16, 2024
7bbab19
Merge branch 'main' into namedarray_typing_np2
Illviljan Jul 18, 2024
bd2b719
Update test_namedarray.py
Illviljan Jul 18, 2024
06b8724
Update _typing.py
Illviljan Jul 19, 2024
25636cb
Merge branch 'main' into namedarray_typing_np2
Illviljan Jul 19, 2024
16b3403
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 19, 2024
0f3afdd
Update _typing.py
Illviljan Jul 19, 2024
ee4cd84
Add shapetypes
Illviljan Jul 19, 2024
c709245
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 19, 2024
23188b4
Fix __array__ missing copy parameter
Illviljan Jul 19, 2024
9471fff
try reverting shapetypes
Illviljan Jul 19, 2024
21cffba
try reverting shapetypes
Illviljan Jul 19, 2024
03af235
Update test_namedarray.py
Illviljan Jul 19, 2024
cdde846
Update _typing.py
Illviljan Jul 19, 2024
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
11 changes: 7 additions & 4 deletions xarray/namedarray/_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,16 @@ def __getitem__(
) -> _arrayfunction[Any, _DType_co] | Any: ...

@overload
def __array__(self, dtype: None = ..., /) -> np.ndarray[Any, _DType_co]: ...

def __array__(
self, dtype: None = ..., /, *, copy: None | bool = ...
) -> np.ndarray[Any, _DType_co]: ...
@overload
def __array__(self, dtype: _DType, /) -> np.ndarray[Any, _DType]: ...
def __array__(
self, dtype: _DType, /, *, copy: None | bool = ...
) -> np.ndarray[Any, _DType]: ...

def __array__(
self, dtype: _DType | None = ..., /
self, dtype: _DType | None = ..., /, *, copy: None | bool = ...
) -> np.ndarray[Any, _DType] | np.ndarray[Any, _DType_co]: ...

# TODO: Should return the same subclass but with a new dtype generic.
Expand Down
6 changes: 3 additions & 3 deletions xarray/tests/test_namedarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def test_init(self, expected: Any) -> None:
# Fail:
(
("x",),
NamedArray("time", np.array([1, 2, 3])), # type: ignore
NamedArray("time", np.array([1, 2, 3], dtype=np.dtype(np.int64))),
np.array([1, 2, 3]),
True,
),
Expand Down Expand Up @@ -341,7 +341,7 @@ def test_dims_setter(
def test_duck_array_class(self) -> None:
numpy_a: NDArray[np.int64]
numpy_a = np.array([2.1, 4], dtype=np.dtype(np.int64))
check_duck_array_typevar(numpy_a) # type: ignore
check_duck_array_typevar(numpy_a)

masked_a: np.ma.MaskedArray[Any, np.dtype[np.int64]]
masked_a = np.ma.asarray([2.1, 4], dtype=np.dtype(np.int64)) # type: ignore[no-untyped-call]
Expand Down Expand Up @@ -560,4 +560,4 @@ def test_broadcast_to_errors(

def test_warn_on_repeated_dimension_names(self) -> None:
with pytest.warns(UserWarning, match="Duplicate dimension names"):
NamedArray(("x", "x"), np.arange(4).reshape(2, 2)) # type: ignore
NamedArray(("x", "x"), np.arange(4).reshape(2, 2))
Loading