typing: use pipe to denote unions

Author: amorison

src/stagpy/commands.py

@@ -15,7 +15,7 @@
 from .stagyydata import _sdat_from_conf
 
 if typing.TYPE_CHECKING:
-    from typing import Callable, Iterable, Mapping, Sequence, Union
+    from typing import Callable, Iterable, Mapping, Sequence
 
     from loam.base import Section
 
@@ -100,7 +100,7 @@ def _pretty_print(
 
 
 def _layout(
-    dict_vars: Mapping[str, Union[Varf, Varr, Vart]],
+    dict_vars: Mapping[str, Varf | Varr | Vart],
     dict_vars_extra: Mapping[str, Callable],
 ) -> None:
     """Print nicely [(var, description)] from phyvars."""

src/stagpy/config.py

@@ -8,7 +8,7 @@
 
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Dict, Sequence, Union
+from typing import Dict, Sequence
 
 import loam.parsers as lprs
 from loam.base import ConfigBase, Section, entry
@@ -41,10 +41,10 @@ class Core(Section):
     read_parameters_dat: bool = switch_opt(True, None, "enable reading parameters.dat")
     outname: str = entry(val="stagpy", cli_short="n", doc="output file name prefix")
     shortname: bool = switch_opt(False, None, "output file name is only prefix")
-    timesteps: Sequence[Union[int, slice]] = _indices.entry(
+    timesteps: Sequence[int | slice] = _indices.entry(
         doc="timesteps slice", in_file=False, cli_short="t"
     )
-    snapshots: Sequence[Union[int, slice]] = _indices.entry(
+    snapshots: Sequence[int | slice] = _indices.entry(
         default=[-1], doc="snapshots slice", in_file=False, cli_short="s"
     )
 
@@ -159,10 +159,10 @@ class Time(Section):
     marktimes: Sequence[float] = TupleEntry(float).entry(
         doc="list of times where to put a mark", in_file=False, cli_short="M"
     )
-    marksteps: Sequence[Union[int, slice]] = _indices.entry(
+    marksteps: Sequence[int | slice] = _indices.entry(
         doc="list of steps where to put a mark", in_file=False, cli_short="T"
     )
-    marksnaps: Sequence[Union[int, slice]] = _indices.entry(
+    marksnaps: Sequence[int | slice] = _indices.entry(
         doc="list of snaps where to put a mark", in_file=False, cli_short="S"
     )
 

src/stagpy/plates.py

@@ -18,7 +18,7 @@
 from .stagyydata import _sdat_from_conf
 
 if typing.TYPE_CHECKING:
-    from typing import Sequence, TextIO, Union
+    from typing import Sequence, TextIO
 
     from matplotlib.axes import Axes
     from numpy.typing import NDArray
@@ -188,7 +188,7 @@ def _continents_location(snap: Step, at_surface: bool = True) -> NDArray:
     If at_surface is True, it is evaluated only at the surface, otherwise it is
     evaluated in the entire domain.
     """
-    icont: Union[int, slice]
+    icont: int | slice
     if at_surface:
         if snap.sdat.par.get("boundaries", "air_layer", False):
             icont = _isurf(snap) - 6

src/stagpy/stagyydata.py

@@ -26,21 +26,14 @@
 
 if typing.TYPE_CHECKING:
     from os import PathLike
-    from typing import (
-        Any,
-        Callable,
-        Iterable,
-        Iterator,
-        Sequence,
-        Union,
-    )
+    from typing import Any, Callable, Iterable, Iterator, Sequence, TypeAlias
 
     from numpy.typing import NDArray
     from pandas import DataFrame, Series
 
     from .config import Core
 
-    StepIndex = Union[int, slice]
+    StepIndex: TypeAlias = int | slice
 
 
 @typing.overload
@@ -56,8 +49,8 @@ def _as_view_item(obj: int) -> None: ...
 
 
 def _as_view_item(
-    obj: Union[Sequence[StepIndex], slice, int],
-) -> Union[Sequence[StepIndex], Sequence[slice], None]:
+    obj: Sequence[StepIndex] | slice | int,
+) -> Sequence[StepIndex] | Sequence[slice] | None:
     """Return None or a suitable iterable to build a StepsView."""
     try:
         iter(obj)  # type: ignore
@@ -312,11 +305,9 @@ def __repr__(self) -> str:
     def __getitem__(self, istep: int) -> Step: ...
 
     @typing.overload
-    def __getitem__(self, istep: Union[slice, Sequence[StepIndex]]) -> StepsView: ...
+    def __getitem__(self, istep: slice | Sequence[StepIndex]) -> StepsView: ...
 
-    def __getitem__(
-        self, istep: Union[int, slice, Sequence[StepIndex]]
-    ) -> Union[Step, StepsView]:
+    def __getitem__(self, istep: int | slice | Sequence[StepIndex]) -> Step | StepsView:
         keys = _as_view_item(istep)
         if keys is not None:
             return StepsView(self, keys)
@@ -406,9 +397,9 @@ def __repr__(self) -> str:
     def __getitem__(self, istep: int) -> Step: ...
 
     @typing.overload
-    def __getitem__(self, istep: Union[slice, Sequence[StepIndex]]) -> StepsView: ...
+    def __getitem__(self, istep: slice | Sequence[StepIndex]) -> StepsView: ...
 
-    def __getitem__(self, isnap: Any) -> Union[Step, StepsView]:
+    def __getitem__(self, isnap: Any) -> Step | StepsView:
         keys = _as_view_item(isnap)
         if keys is not None:
             return StepsView(self, keys).filter(snap=True)
@@ -545,7 +536,7 @@ class StepsView:
         items: iterable of isteps/isnaps or slices.
     """
 
-    def __init__(self, steps_col: Union[Steps, Snaps], items: Sequence[StepIndex]):
+    def __init__(self, steps_col: Steps | Snaps, items: Sequence[StepIndex]):
         self._col = steps_col
         self._items = items
         self._rprofs_averaged: RprofsAveraged | None = None