Updated cumulatives to fix mypy issues

xarray/core/_cumulatives.py

@@ -62,7 +62,7 @@ def cumsum(
             If True, the attributes (`attrs`) will be copied from the original
             object to the new one.  If False (default), the new object will be
             returned without attributes.
-        **kwargs : dict
+        **kwargs : Any
             Additional keyword arguments passed on to `cumsum`.
 
         Returns
@@ -122,8 +122,10 @@ def cumsum(
 
         """
         return self.reduce(
-            duck_array_ops.cumsum,
+            func=duck_array_ops.cumsum,
             dim=dim,
+            axis=axis,
+            skipna=skipna,
             keep_attrs=keep_attrs,
             **kwargs,
         )
@@ -155,7 +157,7 @@ def cumprod(
             If True, the attributes (`attrs`) will be copied from the original
             object to the new one.  If False (default), the new object will be
             returned without attributes.
-        **kwargs : dict
+        **kwargs : Any
             Additional keyword arguments passed on to `cumprod`.
 
         Returns
@@ -215,8 +217,10 @@ def cumprod(
 
         """
         return self.reduce(
-            duck_array_ops.cumprod,
+            func=duck_array_ops.cumprod,
             dim=dim,
+            axis=axis,
+            skipna=skipna,
             keep_attrs=keep_attrs,
             **kwargs,
         )
@@ -264,7 +268,7 @@ def cumsum(
             If True, the attributes (`attrs`) will be copied from the original
             object to the new one.  If False (default), the new object will be
             returned without attributes.
-        **kwargs : dict
+        **kwargs : Any
             Additional keyword arguments passed on to `cumsum`.
 
         Returns
@@ -333,8 +337,10 @@ def cumsum(
 
         """
         return self.reduce(
-            duck_array_ops.cumsum,
+            func=duck_array_ops.cumsum,
             dim=dim,
+            axis=axis,
+            skipna=skipna,
             keep_attrs=keep_attrs,
             **kwargs,
         )
@@ -366,7 +372,7 @@ def cumprod(
             If True, the attributes (`attrs`) will be copied from the original
             object to the new one.  If False (default), the new object will be
             returned without attributes.
-        **kwargs : dict
+        **kwargs : Any
             Additional keyword arguments passed on to `cumprod`.
 
         Returns
@@ -435,8 +441,10 @@ def cumprod(
 
         """
         return self.reduce(
-            duck_array_ops.cumprod,
+            func=duck_array_ops.cumprod,
             dim=dim,
+            axis=axis,
+            skipna=skipna,
             keep_attrs=keep_attrs,
             **kwargs,
         )
@@ -451,6 +459,7 @@ def reduce(
         dim: Dims | ellipsis = None,
         *,
         axis: int | Sequence[int] | None = None,
+        skipna: bool | None = None,
         keep_attrs: bool | None = None,
         keepdims: bool = False,
         **kwargs: Any,
@@ -491,7 +500,7 @@ def cumsum(
             If True, the attributes (`attrs`) will be copied from the original
             object to the new one.  If False (default), the new object will be
             returned without attributes.
-        **kwargs : dict
+        **kwargs : Any
             Additional keyword arguments passed on to `cumsum`.
 
         Returns
@@ -564,9 +573,10 @@ def cumsum(
             )
         else:
             return self.reduce(
-                duck_array_ops.cumsum,
+                func=duck_array_ops.cumsum,
                 dim=dim,
-                keep_attrs=keep_attrs,
+                axis=axis,
+                skipna=skipna,
                 **kwargs,
             )
 
@@ -580,6 +590,7 @@ def reduce(
         dim: Dims | ellipsis = None,
         *,
         axis: int | Sequence[int] | None = None,
+        skipna: bool | None = None,
         keep_attrs: bool | None = None,
         keepdims: bool = False,
         **kwargs: Any,
@@ -620,7 +631,7 @@ def cumsum(
             If True, the attributes (`attrs`) will be copied from the original
             object to the new one.  If False (default), the new object will be
             returned without attributes.
-        **kwargs : dict
+        **kwargs : Any
             Additional keyword arguments passed on to `cumsum`.
 
         Returns
@@ -698,8 +709,9 @@ def cumsum(
             )
         else:
             return self.reduce(
-                duck_array_ops.cumsum,
+                func=duck_array_ops.cumsum,
                 dim=dim,
-                keep_attrs=keep_attrs,
+                axis=axis,
+                skipna=skipna,
                 **kwargs,
             )

xarray/util/generate_cumulatives.py

@@ -21,7 +21,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, Sequence, Dict
+from typing import TYPE_CHECKING, Any, Callable, Sequence
 
 from . import duck_array_ops
 from .options import OPTIONS
@@ -67,6 +67,7 @@ def reduce(
         dim: Dims | ellipsis = None,
         *,
         axis: int | Sequence[int] | None = None,
+        skipna: bool | None = None,
         keep_attrs: bool | None = None,
         keepdims: bool = False,
         **kwargs: Any,
@@ -134,7 +135,7 @@ def {method}(
     object to the new one.  If False (default), the new object will be
     returned without attributes."""
 
-_KWARGS_DOCSTRING = """**kwargs : dict
+_KWARGS_DOCSTRING = """**kwargs : Any
     Additional keyword arguments passed on to `{method}`."""
 
 
@@ -179,10 +180,8 @@ def generate_methods(self):
 
     def generate_method(self, method):
         template_kwargs = dict(obj=self.datastructure.name, method=method.name)
-        extra_kwargs = ""
         yield self._template_signature.format(
             **template_kwargs,
-            extra_kwargs=extra_kwargs,
             cls=self.cls,
         )
 
@@ -243,34 +242,34 @@ class GroupByReductionGenerator(ReductionGenerator):
 
     def generate_code(self, method):
 
-        extra_kwargs = ""
-
         return f"""\
         if flox and OPTIONS["use_flox"] and contains_only_dask_or_numpy(self._obj):
             return self._flox_reduce(
                 func="{method.name}",
-                dim=dim,{extra_kwargs}
+                dim=dim,
                 # fill_value=fill_value,
                 keep_attrs=keep_attrs,
                 **kwargs,
             )
         else:
             return self.reduce(
-                duck_array_ops.{method.array_method},
-                dim=dim,{extra_kwargs}
-                keep_attrs=keep_attrs,
+                func=duck_array_ops.{method.array_method},
+                dim=dim,
+                axis=axis,
+                skipna=skipna,
                 **kwargs,
             )"""
 
 
 class GenericReductionGenerator(ReductionGenerator):
     def generate_code(self, method):
 
-        extra_kwargs = ""
         return f"""\
         return self.reduce(
-            duck_array_ops.{method.array_method},
-            dim=dim,{extra_kwargs}
+            func=duck_array_ops.{method.array_method},
+            dim=dim,
+            axis=axis,
+            skipna=skipna,
             keep_attrs=keep_attrs,
             **kwargs,
         )"""