Fix typing

Author: spencerkclark

xarray/coding/times.py

@@ -5,7 +5,7 @@
 from collections.abc import Callable, Hashable
 from datetime import datetime, timedelta
 from functools import partial
-from typing import TYPE_CHECKING, Union, cast
+from typing import TYPE_CHECKING, Literal, Union, cast
 
 import numpy as np
 import pandas as pd
@@ -25,6 +25,7 @@
 from xarray.core.common import contains_cftime_datetimes, is_np_datetime_like
 from xarray.core.duck_array_ops import array_all, asarray, ravel, reshape
 from xarray.core.formatting import first_n_items, format_timestamp, last_item
+from xarray.core.types import DatetimeUnitOptions
 from xarray.core.utils import attempt_import, emit_user_level_warning
 from xarray.core.variable import Variable
 from xarray.namedarray.parallelcompat import T_ChunkedArray, get_chunked_array_type
@@ -1507,6 +1508,7 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
                 dtype = pop_to(attrs, encoding, "dtype", name=name)
                 dtype = np.dtype(dtype)
                 resolution, _ = np.datetime_data(dtype)
+                resolution = cast(Literal["Y", "M"] | DatetimeUnitOptions, resolution)
                 if np.timedelta64(1, resolution) > np.timedelta64(1, "s"):
                     time_unit = cast(PDDatetimeUnitOptions, "s")
                     dtype = np.dtype("timedelta64[s]")

xarray/core/dataarray.py

@@ -5372,7 +5372,7 @@ def differentiate(
         self,
         coord: Hashable,
         edge_order: Literal[1, 2] = 1,
-        datetime_unit: DatetimeUnitOptions = None,
+        datetime_unit: DatetimeUnitOptions | None = None,
     ) -> Self:
         """Differentiate the array with the second order accurate central
         differences.
@@ -5434,7 +5434,7 @@ def differentiate(
     def integrate(
         self,
         coord: Hashable | Sequence[Hashable] = None,
-        datetime_unit: DatetimeUnitOptions = None,
+        datetime_unit: DatetimeUnitOptions | None = None,
     ) -> Self:
         """Integrate along the given coordinate using the trapezoidal rule.
 
@@ -5446,7 +5446,7 @@ def integrate(
         ----------
         coord : Hashable, or sequence of Hashable
             Coordinate(s) used for the integration.
-        datetime_unit : {'Y', 'M', 'W', 'D', 'h', 'm', 's', 'ms', 'us', 'ns', \
+        datetime_unit : {'W', 'D', 'h', 'm', 's', 'ms', 'us', 'ns', \
                         'ps', 'fs', 'as', None}, optional
             Specify the unit if a datetime coordinate is used.
 
@@ -5488,7 +5488,7 @@ def integrate(
     def cumulative_integrate(
         self,
         coord: Hashable | Sequence[Hashable] = None,
-        datetime_unit: DatetimeUnitOptions = None,
+        datetime_unit: DatetimeUnitOptions | None = None,
     ) -> Self:
         """Integrate cumulatively along the given coordinate using the trapezoidal rule.
 
@@ -5503,7 +5503,7 @@ def cumulative_integrate(
         ----------
         coord : Hashable, or sequence of Hashable
             Coordinate(s) used for the integration.
-        datetime_unit : {'Y', 'M', 'W', 'D', 'h', 'm', 's', 'ms', 'us', 'ns', \
+        datetime_unit : {'W', 'D', 'h', 'm', 's', 'ms', 'us', 'ns', \
                         'ps', 'fs', 'as', None}, optional
             Specify the unit if a datetime coordinate is used.
 

xarray/core/dataset.py

@@ -8247,7 +8247,7 @@ def differentiate(
             The coordinate to be used to compute the gradient.
         edge_order : {1, 2}, default: 1
             N-th order accurate differences at the boundaries.
-        datetime_unit : None or {"Y", "M", "W", "D", "h", "m", "s", "ms", \
+        datetime_unit : None or {"W", "D", "h", "m", "s", "ms", \
             "us", "ns", "ps", "fs", "as", None}, default: None
             Unit to compute gradient. Only valid for datetime coordinate.
 
@@ -8303,7 +8303,7 @@ def differentiate(
     def integrate(
         self,
         coord: Hashable | Sequence[Hashable],
-        datetime_unit: DatetimeUnitOptions = None,
+        datetime_unit: DatetimeUnitOptions | None = None,
     ) -> Self:
         """Integrate along the given coordinate using the trapezoidal rule.
 
@@ -8315,7 +8315,7 @@ def integrate(
         ----------
         coord : hashable, or sequence of hashable
             Coordinate(s) used for the integration.
-        datetime_unit : {'Y', 'M', 'W', 'D', 'h', 'm', 's', 'ms', 'us', 'ns', \
+        datetime_unit : {'W', 'D', 'h', 'm', 's', 'ms', 'us', 'ns', \
                         'ps', 'fs', 'as', None}, optional
             Specify the unit if datetime coordinate is used.
 
@@ -8423,7 +8423,7 @@ def _integrate_one(self, coord, datetime_unit=None, cumulative=False):
     def cumulative_integrate(
         self,
         coord: Hashable | Sequence[Hashable],
-        datetime_unit: DatetimeUnitOptions = None,
+        datetime_unit: DatetimeUnitOptions | None = None,
     ) -> Self:
         """Integrate along the given coordinate using the trapezoidal rule.
 
@@ -8439,7 +8439,7 @@ def cumulative_integrate(
         ----------
         coord : hashable, or sequence of hashable
             Coordinate(s) used for the integration.
-        datetime_unit : {'Y', 'M', 'W', 'D', 'h', 'm', 's', 'ms', 'us', 'ns', \
+        datetime_unit : {'W', 'D', 'h', 'm', 's', 'ms', 'us', 'ns', \
                         'ps', 'fs', 'as', None}, optional
             Specify the unit if datetime coordinate is used.
 

xarray/core/types.py

@@ -254,7 +254,7 @@ def copy(
 InterpOptions = Union[Interp1dOptions, InterpolantOptions, InterpnOptions]
 
 DatetimeUnitOptions = Literal[
-    "Y", "M", "W", "D", "h", "m", "s", "ms", "us", "μs", "ns", "ps", "fs", "as", None
+    "W", "D", "h", "m", "s", "ms", "us", "μs", "ns", "ps", "fs", "as"
 ]
 NPDatetimeUnitOptions = Literal["D", "h", "m", "s", "ms", "us", "ns"]
 PDDatetimeUnitOptions = Literal["s", "ms", "us", "ns"]