Merge pull request #114 from khaeru/typing/xarray-2024.1

Adjust typing for xarray 2024.1.0

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.7.1
+  rev: v1.8.0
   hooks:
   - id: mypy
     additional_dependencies:
@@ -17,7 +17,7 @@ repos:
     - xarray
     args: []
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.1.2
+  rev: v0.1.14
   hooks:
   - id: ruff
   - id: ruff-format

genno/caching.py

@@ -5,14 +5,14 @@
 from hashlib import blake2b
 from inspect import getmembers, iscode
 from pathlib import Path
-from typing import Callable, Union
+from typing import Callable, Set, Union
 
 from .util import unquote
 
 log = logging.getLogger(__name__)
 
 # Types to ignore in Encoder.default()
-IGNORE = set()
+IGNORE: Set[type] = set()
 
 
 @singledispatch
@@ -114,7 +114,7 @@ def hash_args(*args, **kwargs):
         (
             ""
             if len(args) + len(kwargs) == 0
-            else json.dumps((args, kwargs), cls=Encoder)
+            else json.dumps((args, kwargs), cls=Encoder, sort_keys=True)
         ).encode(),
         digest_size=20,
     ).hexdigest()

genno/compat/plotnine/plot.py

@@ -1,7 +1,7 @@
 import logging
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Hashable, Optional, Sequence
+from typing import Any, Dict, Hashable, Optional, Sequence
 from warnings import warn
 
 import plotnine as p9
@@ -30,7 +30,7 @@ class Plot(ABC):
     #: accepted by :meth:`generate`.
     inputs: Sequence[Hashable] = []
     #: Keyword arguments for :meth:`plotnine.ggplot.save`.
-    save_args = dict(verbose=False)
+    save_args: Dict[str, Any] = dict(verbose=False)
 
     # TODO add static geoms automatically in generate()
     __static: Sequence = []

genno/core/sparsedataarray.py

@@ -142,7 +142,7 @@ def __init__(
         self,
         data: Any = dtypes.NA,
         coords: Union[Sequence[Tuple], Mapping[Hashable, Any], None] = None,
-        dims: Union[Hashable, Sequence[Hashable], None] = None,
+        dims: Union[str, Sequence[Hashable], None] = None,
         name: Hashable = None,
         attrs: Optional[Mapping] = None,
         # internal parameters

genno/core/types.py

@@ -1,7 +1,3 @@
-from typing import Hashable, Iterable, Union
-
-# Duplicating xarray 2022.10.0
-Dims = Union[str, Iterable[Hashable], None]
-
+from xarray.core.types import Dims
 
 __all__ = ["Dims"]