From e2b910ea7fb0256a6d60e7e6f20b9549fbdb3e1b Mon Sep 17 00:00:00 2001
From: Michael Niklas <michael.niklas@airbus.com>
Date: Mon, 23 May 2022 12:56:34 +0200
Subject: [PATCH 1/2] fix {full,zeros,ones}_like typing

---
 xarray/core/common.py          | 18 +++++++++---------
 xarray/tests/test_dataarray.py |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/xarray/core/common.py b/xarray/core/common.py
index 626114a1f0f..de7b343be6a 100644
--- a/xarray/core/common.py
+++ b/xarray/core/common.py
@@ -1582,17 +1582,17 @@ 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:
     ...
 
 
@@ -1790,17 +1790,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:
     ...
 
 
@@ -1877,17 +1877,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:
     ...
 
 
diff --git a/xarray/tests/test_dataarray.py b/xarray/tests/test_dataarray.py
index 8e1099b7e33..01d17837f61 100644
--- a/xarray/tests/test_dataarray.py
+++ b/xarray/tests/test_dataarray.py
@@ -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)),
@@ -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)
 

From e8a0d9f1b8e7c7e5c61f7d7c36c6b4ef5db200c4 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 10:59:12 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 xarray/core/common.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/xarray/core/common.py b/xarray/core/common.py
index de7b343be6a..0579a065855 100644
--- a/xarray/core/common.py
+++ b/xarray/core/common.py
@@ -1582,17 +1582,23 @@ def __getitem__(self, value):
 
 
 @overload
-def full_like(other: DataArray, fill_value: Any, dtype: DTypeLikeSave = None) -> DataArray:
+def full_like(
+    other: DataArray, fill_value: Any, dtype: DTypeLikeSave = None
+) -> DataArray:
     ...
 
 
 @overload
-def full_like(other: Dataset, fill_value: Any, dtype: DTypeMaybeMapping = None) -> Dataset:
+def full_like(
+    other: Dataset, fill_value: Any, dtype: DTypeMaybeMapping = None
+) -> Dataset:
     ...
 
 
 @overload
-def full_like(other: Variable, fill_value: Any, dtype: DTypeLikeSave = None) -> Variable:
+def full_like(
+    other: Variable, fill_value: Any, dtype: DTypeLikeSave = None
+) -> Variable:
     ...