Fix mypy type checking tests failure in ds.merge (#3690)

* Added DataArray as valid type input to ds.merge method * Fix import error by specifying type as string
pydata · Jan 13, 2020 · 8a650a1 · 8a650a1
1 parent 59d3ba5
commit 8a650a1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/xarray/core/dataset.py b/xarray/core/dataset.py
@@ -3550,7 +3550,7 @@ def update(self, other: "CoercibleMapping", inplace: bool = None) -> "Dataset":
 
     def merge(
         self,
-        other: "CoercibleMapping",
+        other: Union["CoercibleMapping", "DataArray"],
         inplace: bool = None,
         overwrite_vars: Union[Hashable, Iterable[Hashable]] = frozenset(),
         compat: str = "no_conflicts",