Merge branch 'granular-mask-and-scale' of github.com:Ostheer/xarray i…

…nto granular-mask-and-scale
pydata · Jul 13, 2024 · 11a60e3 · 11a60e3
2 parents 5eecad1 + 0f1e432
commit 11a60e3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/properties/__init__.py b/properties/__init__.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -87,6 +87,7 @@ exclude_lines = ["pragma: no cover", "if TYPE_CHECKING"]
 [tool.mypy]
 enable_error_code = "redundant-self"
 exclude = [
+  'build',
   'xarray/util/generate_.*\.py',
   'xarray/datatree_/doc/.*\.py',
 ]

diff --git a/xarray/conventions.py b/xarray/conventions.py
@@ -387,7 +387,9 @@ def _update_bounds_encoding(variables: T_Variables) -> None:
 T = TypeVar("T")
 
 
-def _item_or_default(obj: Mapping[Any, T] | T, key: Hashable, default: T | None = None) -> T | None:
+def _item_or_default(
+    obj: Mapping[Any, T] | T, key: Hashable, default: T | None = None
+) -> T | None:
     """
     Return item by key if obj is mapping and key is present, else return default value.
     """