build: drop python 3.9, add 3.14 (#249)

* drop 39, add 314

* update syntax

* change windows pin

* fix pinning

Author: tlambert03

.github/workflows/ci.yml

@@ -26,10 +26,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-        python-version: ["3.9", "3.11", "3.13"]
+        python-version: ["3.10", "3.12", "3.14"]
         include:
           - os: ubuntu-latest
-            python-version: "3.11"
+            python-version: "3.10"
+            resolution: "lowest-direct"
+          - os: windows-latest
+            python-version: "3.13"
             resolution: "lowest-direct"
           - os: ubuntu-latest
             python-version: "3.13"

pyproject.toml

@@ -9,7 +9,7 @@ name = "useq-schema"
 description = "Schema for multi-dimensional microscopy experiments"
 readme = "README.md"
 keywords = ["microscopy", "schema"]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = { text = "BSD 3-Clause License" }
 authors = [
     { email = "talley.lambert@gmail.com", name = "Talley Lambert" },
@@ -23,11 +23,11 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Scientific/Engineering",
     "Topic :: Scientific/Engineering :: Medical Science Apps.",
     "Topic :: Scientific/Engineering :: Image Processing",
@@ -37,24 +37,36 @@ classifiers = [
 ]
 dynamic = ["version"]
 dependencies = [
+    "pydantic >=2.12; python_version >= '3.14'",
+    "pydantic >=2.8; python_version >= '3.13'",
     "pydantic >=2.6",
+    "numpy >=2.3.2; python_version >= '3.14'",
     "numpy >=2.1.0; python_version >= '3.13'",
     "numpy >=1.26.0; python_version >= '3.12'",
     "numpy >=1.25.2",
     "typing-extensions >=4",
+    "shapely>=2.1.2; python_version >= '3.14'",
     "shapely>=2.0.7",
 ]
 
 # extras
 # https://peps.python.org/pep-0621/#dependencies-optional-dependencies
 [project.optional-dependencies]
 yaml = ["PyYAML >=5.0"]
-plot = ["matplotlib >=3.7"]
+plot = [
+    "matplotlib >=3.10.5; python_version >= '3.14'",
+    "matplotlib >=3.9.2; python_version >= '3.13'",
+    "matplotlib >=3.7.3; python_version >= '3.12'",
+    "matplotlib >=3.7",
+]
 
 [dependency-groups]
 test = ["psygnal>=0.13.0", "pytest>=8.0", "pytest-cov>=6.1.1", "pyyaml>=6.0.2"]
 dev = [
     { include-group = "test" },
+    "matplotlib >=3.10.5; python_version >= '3.14'",
+    "matplotlib >=3.9.2; python_version >= '3.13'",
+    "matplotlib >=3.7.3; python_version >= '3.12'",
     "matplotlib >=3.7",
     "ipython>=8.18.1",
     "mypy>=1.15.0",
@@ -89,7 +101,7 @@ packages = ["src/useq"]
 # https://beta.ruff.rs/docs/rules/
 [tool.ruff]
 line-length = 88
-target-version = "py39"
+target-version = "py310"
 src = ["src", "tests"]
 fix = true
 unsafe-fixes = true

src/useq/_actions.py

@@ -1,8 +1,7 @@
-from typing import Optional, Union
+from typing import Literal
 
 from pydantic import ConfigDict, Field, TypeAdapter, field_validator
 from pydantic_core import PydanticSerializationError
-from typing_extensions import Literal
 
 from useq._base_model import FrozenModel
 
@@ -63,8 +62,8 @@ class HardwareAutofocus(Action):
     """
 
     type: Literal["hardware_autofocus"] = "hardware_autofocus"  # pyright: ignore[reportIncompatibleVariableOverride]
-    autofocus_device_name: Optional[str] = None
-    autofocus_motor_offset: Optional[float] = None
+    autofocus_device_name: str | None = None
+    autofocus_motor_offset: float | None = None
     max_retries: int = 3
 
 
@@ -106,4 +105,4 @@ def _ensure_serializable(cls, data: dict) -> dict:
         return data
 
 
-AnyAction = Union[HardwareAutofocus, AcquireImage, CustomAction]
+AnyAction = HardwareAutofocus | AcquireImage | CustomAction

src/useq/_base_model.py

@@ -6,9 +6,7 @@
     TYPE_CHECKING,
     Any,
     ClassVar,
-    Optional,
     TypeVar,
-    Union,
 )
 
 import numpy as np
@@ -89,7 +87,7 @@ class MutableModel(_ReplaceableModel):
 
 class UseqModel(FrozenModel):
     @classmethod
-    def from_file(cls: type[_Y], path: Union[str, Path]) -> _Y:
+    def from_file(cls: type[_Y], path: str | Path) -> _Y:
         """Return an instance of this class from a file.  Supports JSON and YAML."""
         path = Path(path)
         if path.suffix in {".yaml", ".yml"}:
@@ -106,14 +104,14 @@ def from_file(cls: type[_Y], path: Union[str, Path]) -> _Y:
     def yaml(
         self,
         *,
-        include: Optional[Union[set, dict]] = None,
-        exclude: Optional[Union[set, dict]] = None,
+        include: set | dict | None = None,
+        exclude: set | dict | None = None,
         by_alias: bool = False,
         exclude_unset: bool = True,  # pydantic has False by default
         exclude_defaults: bool = False,
         exclude_none: bool = False,
-        stream: Optional[IO[str]] = None,
-    ) -> Optional[str]:
+        stream: IO[str] | None = None,
+    ) -> str | None:
         """Generate a YAML representation of the model.
 
         Returns

src/useq/_channel.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import Field, model_validator
 
@@ -33,11 +33,11 @@ class Channel(FrozenModel):
 
     config: str
     group: str = "Channel"
-    exposure: Optional[float] = Field(None, gt=0.0)
+    exposure: float | None = Field(None, gt=0.0)
     do_stack: bool = True
     z_offset: float = 0.0
     acquire_every: int = Field(default=1, gt=0)  # acquire every n frames
-    camera: Optional[str] = None
+    camera: str | None = None
 
     @model_validator(mode="before")
     @classmethod

src/useq/_grid.py

@@ -3,22 +3,20 @@
 import contextlib
 import math
 import warnings
-from collections.abc import Iterable, Iterator, Sequence
+from collections.abc import Callable, Iterable, Iterator, Sequence
 from enum import Enum
 from typing import (
     TYPE_CHECKING,
     Annotated,
     Any,
-    Callable,
-    Optional,
-    Union,
+    TypeAlias,
 )
 
 import numpy as np
 from annotated_types import Ge, Gt
 from pydantic import Field, PrivateAttr, field_validator, model_validator
 from shapely import Polygon, box, prepared
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self
 
 from useq._point_visiting import OrderMode, TraversalOrder
 from useq._position import (
@@ -434,14 +432,14 @@ class GridFromPolygon(_GridPlan[AbsolutePosition]):
         ),
     ]
     convex_hull: Annotated[
-        Optional[bool],
+        bool | None,
         Field(
             False,
             description="If True, the convex hull of the polygon will be used.",
         ),
     ] = False
     offset: Annotated[
-        Optional[float],
+        float | None,
         Field(
             None,
             frozen=True,
@@ -702,10 +700,10 @@ class RandomPoints(_MultiPointPlan[RelativePosition]):
     max_width: Annotated[float, Gt(0)] = 1
     max_height: Annotated[float, Gt(0)] = 1
     shape: Shape = Shape.ELLIPSE
-    random_seed: Optional[int] = None
+    random_seed: int | None = None
     allow_overlap: bool = True
-    order: Optional[TraversalOrder] = TraversalOrder.TWO_OPT
-    start_at: Union[RelativePosition, Annotated[int, Ge(0)]] = 0
+    order: TraversalOrder | None = TraversalOrder.TWO_OPT
+    start_at: RelativePosition | Annotated[int, Ge(0)] = 0
 
     @model_validator(mode="after")
     def _validate_startat(self) -> Self:
@@ -818,8 +816,8 @@ def _random_points_in_rectangle(
 
 
 # all of these support __iter__() -> Iterator[PositionBase] and num_positions() -> int
-RelativeMultiPointPlan = Union[
-    GridRowsColumns, GridWidthHeight, RandomPoints, RelativePosition
-]
-AbsoluteMultiPointPlan = Union[GridFromEdges, GridFromPolygon]
-MultiPointPlan = Union[AbsoluteMultiPointPlan, RelativeMultiPointPlan]
+RelativeMultiPointPlan = (
+    GridRowsColumns | GridWidthHeight | RandomPoints | RelativePosition
+)
+AbsoluteMultiPointPlan = GridFromEdges | GridFromPolygon
+MultiPointPlan = AbsoluteMultiPointPlan | RelativeMultiPointPlan

src/useq/_hardware_autofocus.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import PrivateAttr
 
@@ -22,8 +22,8 @@ class AutoFocusPlan(FrozenModel):
         If None, the autofocus motor should not be moved.
     """
 
-    autofocus_device_name: Optional[str] = None
-    autofocus_motor_offset: Optional[float] = None
+    autofocus_device_name: str | None = None
+    autofocus_motor_offset: float | None = None
 
     def as_action(self) -> HardwareAutofocus:
         """Return a [`useq.HardwareAutofocus`][] for this autofocus plan."""
@@ -32,7 +32,7 @@ def as_action(self) -> HardwareAutofocus:
             autofocus_motor_offset=self.autofocus_motor_offset,
         )
 
-    def event(self, event: MDAEvent) -> Optional[MDAEvent]:
+    def event(self, event: MDAEvent) -> MDAEvent | None:
         """Return an autofocus [`useq.MDAEvent`][] if autofocus should be performed.
 
         The z position of the new [`useq.MDAEvent`][] is also updated if a relative

src/useq/_iter_sequence.py

@@ -151,7 +151,9 @@ def _iter_sequence(
         if not item:  # the case with no events
             continue  # pragma: no cover
         # get axes objects for this event
-        index, time, position, grid, channel, z_pos = _parse_axes(zip(order, item))
+        index, time, position, grid, channel, z_pos = _parse_axes(
+            zip(order, item, strict=False)
+        )
 
         # skip if necessary
         if _should_skip(position, channel, index, sequence.z_plan):

src/useq/_mda_event.py

@@ -28,7 +28,7 @@
 
     from useq._mda_sequence import MDASequence
 
-    ReprArgs = Sequence[tuple[Optional[str], Any]]
+    ReprArgs = Sequence[tuple[str | None, Any]]
 
 
 class Channel(UseqModel):
@@ -83,8 +83,8 @@ class SLMImage(UseqModel):
     """
 
     data: Any = Field(..., repr=False)
-    device: Optional[str] = None
-    exposure: Optional[float] = Field(default=None, gt=0.0)
+    device: str | None = None
+    exposure: float | None = Field(default=None, gt=0.0)
 
     @model_validator(mode="before")
     def _cast_data(cls, v: Any) -> Any:
@@ -112,8 +112,8 @@ class Kwargs(TypedDict, total=False):
             """Type for the kwargs passed to the SLM image."""
 
             data: npt.ArrayLike
-            device: Optional[str]
-            exposure: Optional[float]
+            device: str | None
+            exposure: float | None
 
 
 class PropertyTuple(NamedTuple):
@@ -134,7 +134,7 @@ class PropertyTuple(NamedTuple):
     property_value: Any
 
 
-def _float_or_none(v: Any) -> Optional[float]:
+def _float_or_none(v: Any) -> float | None:
     return float(v) if v is not None else v
 
 
@@ -238,16 +238,16 @@ class MDAEvent(UseqModel):
     """
 
     index: ReadOnlyDict = Field(default_factory=ReadOnlyDict)
-    channel: Optional[Channel] = None
-    exposure: Optional[float] = Field(default=None, gt=0.0)
-    min_start_time: Optional[float] = None  # time in sec
-    pos_name: Optional[str] = None
-    x_pos: Optional[float] = None
-    y_pos: Optional[float] = None
-    z_pos: Optional[float] = None
-    slm_image: Optional[SLMImage] = None
+    channel: Channel | None = None
+    exposure: float | None = Field(default=None, gt=0.0)
+    min_start_time: float | None = None  # time in sec
+    pos_name: str | None = None
+    x_pos: float | None = None
+    y_pos: float | None = None
+    z_pos: float | None = None
+    slm_image: SLMImage | None = None
     sequence: Optional["MDASequence"] = Field(default=None, repr=False)
-    properties: Optional[list[PropertyTuple]] = None
+    properties: list[PropertyTuple] | None = None
     metadata: dict[str, Any] = Field(default_factory=dict)
     action: AnyAction = Field(default_factory=AcquireImage, discriminator="type")
     keep_shutter_open: bool = False