Skip to content

fix {full,zeros,ones}_like overloads #6630

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 2 commits into from
May 24, 2022
Merged

fix {full,zeros,ones}_like overloads #6630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2b910e
fix {full,zeros,ones}_like typing
headtr1ck May 23, 2022
e8a0d9f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 23, 2022
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
24 changes: 15 additions & 9 deletions xarray/core/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,17 +1582,23 @@ def __getitem__(self, value):


@overload
def full_like(other: DataArray, fill_value: Any, dtype: DTypeLikeSave) -> DataArray:
def full_like(
other: DataArray, fill_value: Any, dtype: DTypeLikeSave = None
) -> DataArray:
...


@overload
def full_like(other: Dataset, fill_value: Any, dtype: DTypeMaybeMapping) -> Dataset:
def full_like(
other: Dataset, fill_value: Any, dtype: DTypeMaybeMapping = None
) -> Dataset:
...


@overload
def full_like(other: Variable, fill_value: Any, dtype: DTypeLikeSave) -> Variable:
def full_like(
other: Variable, fill_value: Any, dtype: DTypeLikeSave = None
) -> Variable:
...


Expand Down Expand Up @@ -1790,17 +1796,17 @@ def _full_like_variable(


@overload
def zeros_like(other: DataArray, dtype: DTypeLikeSave) -> DataArray:
def zeros_like(other: DataArray, dtype: DTypeLikeSave = None) -> DataArray:
...


@overload
def zeros_like(other: Dataset, dtype: DTypeMaybeMapping) -> Dataset:
def zeros_like(other: Dataset, dtype: DTypeMaybeMapping = None) -> Dataset:
...


@overload
def zeros_like(other: Variable, dtype: DTypeLikeSave) -> Variable:
def zeros_like(other: Variable, dtype: DTypeLikeSave = None) -> Variable:
...


Expand Down Expand Up @@ -1877,17 +1883,17 @@ def zeros_like(


@overload
def ones_like(other: DataArray, dtype: DTypeLikeSave) -> DataArray:
def ones_like(other: DataArray, dtype: DTypeLikeSave = None) -> DataArray:
...


@overload
def ones_like(other: Dataset, dtype: DTypeMaybeMapping) -> Dataset:
def ones_like(other: Dataset, dtype: DTypeMaybeMapping = None) -> Dataset:
...


@overload
def ones_like(other: Variable, dtype: DTypeLikeSave) -> Variable:
def ones_like(other: Variable, dtype: DTypeLikeSave = None) -> Variable:
...


Expand Down
6 changes: 3 additions & 3 deletions xarray/tests/test_dataarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3566,7 +3566,7 @@ def test_setattr_raises(self):
with pytest.raises(AttributeError, match=r"cannot set attr"):
array.other = 2

def test_full_like(self):
def test_full_like(self) -> None:
# For more thorough tests, see test_variable.py
da = DataArray(
np.random.random(size=(2, 2)),
Expand All @@ -3578,12 +3578,12 @@ def test_full_like(self):

actual = full_like(da, 2)
expect = da.copy(deep=True)
expect.values = [[2.0, 2.0], [2.0, 2.0]]
expect.values = np.array([[2.0, 2.0], [2.0, 2.0]])
assert_identical(expect, actual)

# override dtype
actual = full_like(da, fill_value=True, dtype=bool)
expect.values = [[True, True], [True, True]]
expect.values = np.array([[True, True], [True, True]])
assert expect.dtype == bool
assert_identical(expect, actual)

Expand Down