Remove from __future__ import annotations

Python does not appear to be heading in this direction and is
considering other approaches to annotations. This future import is
dropped so that we stop relying on a feature that may not come to pass.

See also #109, https://peps.python.org/pep-0649/

src/emsarray/accessors.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 
 import xarray

src/emsarray/conventions/_base.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import abc
 import dataclasses
 import enum
@@ -869,7 +867,7 @@ def make_linear(self, data_array: xarray.DataArray) -> xarray.DataArray:
 
     @cached_property  # type: ignore
     @_requires_plot
-    def data_crs(self) -> CRS:
+    def data_crs(self) -> 'CRS':
         """
         The coordinate reference system that coordinates in this dataset are
         defined in.
@@ -883,7 +881,7 @@ def data_crs(self) -> CRS:
     @_requires_plot
     def plot_on_figure(
         self,
-        figure: Figure,
+        figure: 'Figure',
         scalar: Optional[DataArrayOrName] = None,
         vector: Optional[tuple[DataArrayOrName, DataArrayOrName]] = None,
         title: Optional[str] = None,
@@ -963,13 +961,13 @@ def plot(self, *args: Any, **kwargs: Any) -> None:
     @_requires_plot
     def animate_on_figure(
         self,
-        figure: Figure,
+        figure: 'Figure',
         scalar: Optional[DataArrayOrName] = None,
         vector: Optional[tuple[DataArrayOrName, DataArrayOrName]] = None,
         coordinate: Optional[DataArrayOrName] = None,
         title: Optional[Union[str, Callable[[Any], str]]] = None,
         **kwargs: Any,
-    ) -> FuncAnimation:
+    ) -> 'FuncAnimation':
         """
         Make an animated plot of a data array.
 
@@ -1066,7 +1064,7 @@ def make_poly_collection(
         self,
         data_array: Optional[DataArrayOrName] = None,
         **kwargs: Any,
-    ) -> PolyCollection:
+    ) -> 'PolyCollection':
         """
         Make a :class:`~matplotlib.collections.PolyCollection`
         from the geometry of this :class:`~xarray.Dataset`.
@@ -1143,7 +1141,7 @@ def make_patch_collection(
         self,
         data_array: Optional[DataArrayOrName] = None,
         **kwargs: Any,
-    ) -> PolyCollection:
+    ) -> 'PolyCollection':
         warnings.warn(
             "Convention.make_patch_collection has been renamed to "
             "Convention.make_poly_collection, and now returns a PolyCollection",
@@ -1154,11 +1152,11 @@ def make_patch_collection(
     @_requires_plot
     def make_quiver(
         self,
-        axes: Axes,
+        axes: 'Axes',
         u: Optional[DataArrayOrName] = None,
         v: Optional[DataArrayOrName] = None,
         **kwargs: Any,
-    ) -> Quiver:
+    ) -> 'Quiver':
         """
         Make a :class:`matplotlib.quiver.Quiver` instance to plot vector data.
 

src/emsarray/conventions/_registry.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import sys
 import warnings

src/emsarray/conventions/arakawa_c.py

@@ -6,8 +6,6 @@
 `Arakawa grids <https://en.wikipedia.org/wiki/Arakawa_grids>`_ on Wikipedia
 
 """
-from __future__ import annotations
-
 import enum
 import logging
 from collections.abc import Hashable, Sequence
@@ -119,7 +117,7 @@ class ArakawaCGridKind(str, enum.Enum):
     #: :meta hide-value:
     node = 'node'
 
-    def __call__(self, j: int, i: int) -> ArakawaCIndex:
+    def __call__(self, j: int, i: int) -> 'ArakawaCIndex':
         return (self, j, i)
 
 

src/emsarray/conventions/grid.py

@@ -2,8 +2,6 @@
 Datasets following the CF conventions with gridded datasets.
 Both 1D coordinates and 2D coordinates are supported.
 """
-from __future__ import annotations
-
 import abc
 import enum
 import itertools

src/emsarray/conventions/shoc.py

@@ -14,8 +14,6 @@
 --------
 `SHOC documentation <https://research.csiro.au/cem/software/ems/hydro/strucutured-shoc/>`_
 """
-from __future__ import annotations
-
 import logging
 from collections.abc import Hashable
 from functools import cached_property

src/emsarray/conventions/ugrid.py

@@ -5,8 +5,6 @@
 --------
 `UGRID conventions <https://ugrid-conventions.github.io/ugrid-conventions/>`_
 """
-from __future__ import annotations
-
 import enum
 import logging
 import pathlib
@@ -39,7 +37,10 @@ def _split_coord(attr: str) -> tuple[str, str]:
     return (x, y)
 
 
-def buffer_faces(face_indices: numpy.ndarray, topology: Mesh2DTopology) -> numpy.ndarray:
+def buffer_faces(
+    face_indices: numpy.ndarray,
+    topology: 'Mesh2DTopology',
+) -> numpy.ndarray:
     """
     When clipping a dataset to a region, including a buffer of extra faces
     around the included faces is desired. Given an array of face indices,
@@ -68,7 +69,10 @@ def buffer_faces(face_indices: numpy.ndarray, topology: Mesh2DTopology) -> numpy
     return cast(numpy.ndarray, numpy.fromiter(included_faces, dtype=topology.sensible_dtype))
 
 
-def mask_from_face_indices(face_indices: numpy.ndarray, topology: Mesh2DTopology) -> xarray.Dataset:
+def mask_from_face_indices(
+    face_indices: numpy.ndarray,
+    topology: 'Mesh2DTopology',
+) -> xarray.Dataset:
     """
     Make a mask dataset from a list of face indices.
     This mask can later be applied using :meth:`~.Convention.apply_clip_mask`.
@@ -868,7 +872,7 @@ def _face_and_node_pair_iter(self) -> Iterable[tuple[int, list[tuple[int, int]]]
             yield face_index, list(utils.pairwise(node_indices))
 
     @cached_property
-    def dimension_for_grid_kind(self) -> dict[UGridKind, Hashable]:
+    def dimension_for_grid_kind(self) -> dict['UGridKind', Hashable]:
         """
         Get the dimension names for each of the grid types in this dataset.
         """

src/emsarray/masking.py

@@ -3,8 +3,6 @@
 Masks are used when clipping datasets to a smaller geographic subset,
 such as :meth:`.Convention.clip`.
 """
-from __future__ import annotations
-
 import functools
 import itertools
 import logging

src/emsarray/plot.py

@@ -1,18 +1,14 @@
-from __future__ import annotations
-
 from collections.abc import Iterable
-from typing import TYPE_CHECKING, Any, Callable, Literal, Optional, Union
+from typing import Any, Callable, Literal, Optional, Union
 
 import numpy
 import xarray
 
+from emsarray import conventions
 from emsarray.exceptions import NoSuchCoordinateError
 from emsarray.types import Landmark
 from emsarray.utils import requires_extra
 
-if TYPE_CHECKING:
-    from .conventions import Convention
-
 try:
     import cartopy.crs
     from cartopy.feature import GSHHSFeature
@@ -263,7 +259,7 @@ def make_plot_title(
 @_requires_plot
 def plot_on_figure(
     figure: Figure,
-    convention: Convention,
+    convention: 'conventions.Convention',
     *,
     scalar: Optional[xarray.DataArray] = None,
     vector: Optional[tuple[xarray.DataArray, xarray.DataArray]] = None,
@@ -354,7 +350,7 @@ def plot_on_figure(
 @_requires_plot
 def animate_on_figure(
     figure: Figure,
-    convention: Convention,
+    convention: 'conventions.Convention',
     *,
     coordinate: xarray.DataArray,
     scalar: Optional[xarray.DataArray] = None,

src/emsarray/state.py

@@ -1,15 +1,12 @@
 """
 Dataclass for containing state required for emsarray
 """
-from __future__ import annotations
-
 import dataclasses
-from typing import TYPE_CHECKING, Final, Optional, cast
+from typing import Final, Optional, cast
 
 import xarray
 
-if TYPE_CHECKING:
-    from emsarray.conventions._base import Convention
+from emsarray import conventions
 
 
 @dataclasses.dataclass
@@ -20,7 +17,7 @@ class State:
     to avoid convention autodetection.
     """
     dataset: xarray.Dataset
-    convention: Optional[Convention] = None
+    convention: Optional['conventions.Convention'] = None
 
     accessor_name: Final[str] = "_emsarray_state"
 
@@ -32,7 +29,7 @@ def get(cls, dataset: xarray.Dataset) -> "State":
         """
         return cast(State, getattr(dataset, State.accessor_name))
 
-    def bind_convention(self, convention: Convention) -> None:
+    def bind_convention(self, convention: 'conventions.Convention') -> None:
         """
         Bind a Convention instance to this Dataset.
         If the Dataset is already bound, an error is raised.

src/emsarray/transect.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import dataclasses
 from collections.abc import Hashable, Iterable
 from functools import cached_property

src/emsarray/utils.py

@@ -7,8 +7,6 @@
 --------
 :mod:`emsarray.operations`
 """
-from __future__ import annotations
-
 import datetime
 import functools
 import itertools
@@ -51,7 +49,7 @@ class PerfTimer:
     def __init__(self) -> None:
         self.running = False
 
-    def __enter__(self) -> PerfTimer:
+    def __enter__(self) -> 'PerfTimer':
         if self.running:
             raise RuntimeError("Timer is already running")
         self.running = True

tests/cli/test_utils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import argparse
 import json
 from pathlib import Path

tests/conventions/test_base.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import dataclasses
 import enum
 import pathlib

tests/conventions/test_cfgrid1d.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import json
 import pathlib
 

tests/conventions/test_cfgrid2d.py

@@ -5,8 +5,6 @@
 Instead of writing two identical test suites,
 the SHOC simple convention is used to test both.
 """
-from __future__ import annotations
-
 import itertools
 import json
 import pathlib

tests/conventions/test_shoc_standard.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import itertools
 import json
 import pathlib

tests/conventions/test_ugrid.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import json
 import pathlib
 import warnings

tests/masking/test_mask_dataset.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import pathlib
 
 import netCDF4

tests/masking/test_utils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import pathlib
 
 import netCDF4

tests/utils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import abc
 import contextlib
 import itertools