build: drop python 3.8, support python 3.13

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         platform: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
@@ -43,6 +43,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
 
       - name: Install
         run: |
@@ -64,16 +65,17 @@ jobs:
 
   test-min-reqs:
     name: Test min reqs
-    uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@main
+    uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@v2
+    secrets:
+      codecov_token: ${{ secrets.CODECOV_TOKEN }}
     with:
       os: ubuntu-latest
       python-version: ${{ matrix.python-version }}
       pip-install-min-reqs: true
-      pytest-cov-flags: ""
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.10", "3.12"]
+        python-version: ["3.9", "3.11", "3.13"]
 
   test-widget:
     name: test-widget

.github/workflows/test_dependents.yml

@@ -144,7 +144,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.9"
       - name: Install dependencies
         run: |
           python -m pip install -U pip

.pre-commit-config.yaml

@@ -32,4 +32,4 @@ repos:
           - pydantic-compat
           - xsdata==24.2.1
           - Pint
-          - types-lxml; python_version > '3.8'
+          - types-lxml

docs/scripts/write_v2_changes.py

@@ -2,7 +2,7 @@
 
 import json
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Iterator
+from typing import TYPE_CHECKING, Any
 
 from deepdiff import DeepDiff
 from fuzzywuzzy import fuzz
@@ -12,6 +12,7 @@
 from ome_types.model import Reference
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
     from types import ModuleType
 
 DOCS = Path(__file__).parent.parent

pyproject.toml

@@ -9,7 +9,7 @@ name = "ome-types"
 description = "Python dataclasses for the OME data model"
 keywords = ["ome", "ome-model", "microscopy", "schema", "types"]
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 license = { text = "MIT" }
 authors = [{ name = "Talley Lambert", email = "talley.lambert@gmail.com" }]
 classifiers = [
@@ -21,14 +21,18 @@ classifiers = [
   "Operating System :: OS Independent",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.8",
   "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",
 ]
 dynamic = ["version"]
-dependencies = ["pydantic >=1.9.0", "pydantic-compat >=0.1.0", "xsdata >=23.6,<24.4"]
+dependencies = [
+  "pydantic >=1.10.0",
+  "pydantic-compat >=0.1.0",
+  "xsdata >=23.6,<24.4",
+]
 
 [project.urls]
 Source = "https://github.com/tlambert03/ome-types"
@@ -45,18 +49,18 @@ pint = ["Pint >=0.15"]
 lxml = ["lxml >=4.8.0"]
 docs = ["mkdocs-material", "mkdocstrings-python"]
 test = [
-  "lxml",
   "mypy",
   "numpy",
-  "pint",
+  "lxml; python_version <= '3.12'",
+  "pint; python_version <= '3.12'",
   "pytest-codspeed",
   "pytest-cov",
   "pytest-mypy-plugins",
   "pytest",
   "ruff",
-  "xmlschema <2.5",                      # FIXME: determine why
+  "xmlschema <2.5",                 # FIXME: determine why
   "xsdata[cli]",
-  "types-lxml; python_version >= '3.8'",
+  "types-lxml",
 ]
 test-qt = ["qtpy", "pytest-qt"]
 # pin ruff for builds because it changes often
@@ -87,7 +91,7 @@ exclude = ["src/ome_types/_autogenerated"]
 [tool.ruff]
 line-length = 88
 src = ["src", "tests"]
-target-version = "py38"
+target-version = "py39"
 exclude = ['src/_ome_autogen.py', 'src/ome_types/_vendor']
 
 [tool.ruff.lint]

src/ome_autogen/_util.py

@@ -4,11 +4,14 @@
 import re
 from collections import defaultdict
 from contextlib import contextmanager
-from functools import lru_cache
+from functools import cache
 from pathlib import Path
-from typing import Any, Iterator, NamedTuple, cast
+from typing import TYPE_CHECKING, Any, NamedTuple, cast
 from xml.etree import ElementTree as ET
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 SRC_PATH = Path(__file__).parent.parent
 SCHEMA_FILE = (SRC_PATH / "ome_types" / "ome-2016-06.xsd").absolute()
 
@@ -40,7 +43,7 @@ class AppInfo(NamedTuple):
     abstract: list[str]
 
 
-@lru_cache(maxsize=None)
+@cache
 def get_appinfo(schema: Path | str = SCHEMA_FILE) -> AppInfo:
     """Gather all the <xsd:appinfo> stuff from the schema.
 

src/ome_autogen/generator.py

@@ -2,7 +2,7 @@
 
 from contextlib import contextmanager
 from pathlib import Path
-from typing import TYPE_CHECKING, Iterator, cast
+from typing import TYPE_CHECKING, cast
 
 from xsdata.formats.dataclass.filters import Filters
 from xsdata.formats.dataclass.generator import DataclassGenerator
@@ -12,6 +12,8 @@
 from xsdata_pydantic_basemodel.generator import PydanticBaseFilters
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
+
     from jinja2 import Environment, FileSystemLoader
     from xsdata.codegen.models import Attr, Class
     from xsdata.codegen.resolver import DependenciesResolver

src/ome_autogen/overrides.py

@@ -1,7 +1,10 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Sequence
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 # from ome_types._mixins._base_type import AUTO_SEQUENCE
 # avoiding import to avoid build-time dependency on the ome-types package

src/ome_autogen/transformer.py

@@ -1,14 +1,16 @@
 from __future__ import annotations
 
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Iterator
+from typing import TYPE_CHECKING
 
 from xsdata.codegen.analyzer import ClassAnalyzer
 from xsdata.codegen.container import ClassContainer
 from xsdata.codegen.handlers import RenameDuplicateAttributes
 from xsdata.codegen.mappers.schema import SchemaMapper
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
+
     from xsdata.codegen.transformer import ResourceTransformer
 
 else:

src/ome_types/_conversion.py

@@ -4,11 +4,11 @@
 import operator
 import os
 import warnings
-from contextlib import nullcontext, suppress
-from functools import lru_cache
+from contextlib import AbstractContextManager, nullcontext, suppress
+from functools import cache
 from pathlib import Path
 from struct import Struct
-from typing import TYPE_CHECKING, Callable, Iterable, cast, overload
+from typing import TYPE_CHECKING, Callable, cast, overload
 
 from pydantic import BaseModel
 from xsdata.formats.dataclass.parsers.config import ParserConfig
@@ -26,7 +26,8 @@
 
 
 if TYPE_CHECKING:
-    from typing import Any, BinaryIO, ContextManager, Literal, TypedDict
+    from collections.abc import Iterable
+    from typing import Any, BinaryIO, Literal, TypedDict
     from xml.etree import ElementTree
 
     import xmlschema
@@ -174,7 +175,7 @@ def _unpack(fh: BinaryIO, strct: Struct) -> int:
 def tiff2xml(path: Path | str | BinaryIO) -> bytes:
     """Extract the OME-XML from a TIFF file."""
     if hasattr(path, "read"):
-        ctx: ContextManager[BinaryIO] = nullcontext(path)  # type: ignore[arg-type]
+        ctx: AbstractContextManager = nullcontext(path)
     else:
         ctx = Path(path).open(mode="rb")
 
@@ -389,7 +390,7 @@ def validate_xml_with_xmlschema(
     return tree
 
 
-@lru_cache(maxsize=None)
+@cache
 def _get_XMLSchema(schema: Path | str) -> xmlschema.XMLSchema:
     import xmlschema
 

src/ome_types/_mixins/_base_type.py

@@ -1,17 +1,13 @@
 import warnings
+from collections.abc import Sequence
 from datetime import datetime
 from enum import Enum
 from textwrap import indent
 from typing import (
     TYPE_CHECKING,
     Any,
     ClassVar,
-    Dict,
     Optional,
-    Sequence,
-    Set,
-    Tuple,
-    Type,
     TypeVar,
     cast,
 )
@@ -53,7 +49,7 @@
 }
 
 
-def _move_deprecated_fields(data: Dict[str, Any], field_names: Set[str]) -> None:
+def _move_deprecated_fields(data: dict[str, Any], field_names: set[str]) -> None:
     for key in list(data):
         if (
             key not in field_names
@@ -90,7 +86,7 @@
 
     # allow use with weakref
     if not PYDANTIC2:
-        __slots__: ClassVar[Set[str]] = {"__weakref__"}  # type: ignore
+        __slots__: ClassVar[set[str]] = {"__weakref__"}  # type: ignore
 
     _vid = field_validator("id", mode="before", check_fields=False)(validate_id)
 
@@ -121,7 +117,7 @@
         """
         add_quantity_properties(cls)
 
-    def __repr_args__(self) -> Sequence[Tuple[Optional[str], Any]]:
+    def __repr_args__(self) -> Sequence[tuple[Optional[str], Any]]:
         """Repr with only set values, and truncated sequences."""
         args = []
         for k, v in self.model_dump(exclude_defaults=True).items():
@@ -177,7 +173,7 @@
         return to_xml(self, **kwargs)
 
     @classmethod
-    def from_xml(cls: Type[T], xml: "XMLSource", **kwargs: Any) -> T:
+    def from_xml(cls: type[T], xml: "XMLSource", **kwargs: Any) -> T:
         """Read an ome-types class from XML.
 
         See docstring of [`ome_types.from_xml`][] for kwargs.

src/ome_types/_mixins/_collections.py

@@ -1,5 +1,6 @@
 import itertools
-from typing import Any, Generic, Iterator, List, TypeVar, Union, cast, no_type_check
+from collections.abc import Iterator
+from typing import Any, Generic, TypeVar, Union, cast, no_type_check
 
 from pydantic import BaseModel
 
@@ -50,7 +51,7 @@ def append(self, item: T) -> None:
         """Append an item to the appropriate field list."""
         cast(list, getattr(self, self._field_name(item))).append(item)
 
-    def extend(self, items: List[T]) -> None:
+    def extend(self, items: list[T]) -> None:
         """Extend the appropriate field list with the given items."""
         for item in items:
             self.append(item)

src/ome_types/_mixins/_instrument.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, List, Union, cast
+from typing import TYPE_CHECKING, Union, cast
 
 if TYPE_CHECKING:
     from ome_types._autogenerated.ome_2016_06 import (
@@ -17,7 +17,7 @@
 
 class InstrumentMixin:
     @property
-    def light_source_group(self) -> List["LightSource"]:
+    def light_source_group(self) -> list["LightSource"]:
         # here for backwards compatibility
         slf = cast("Instrument", self)
         return [

src/ome_types/_mixins/_kinded.py

@@ -1,4 +1,5 @@
-from typing import Any, Dict
+import builtins
+from typing import Any
 
 from pydantic_compat import BaseModel
 
@@ -19,15 +20,15 @@ def __init__(self, **data: Any) -> None:
         data.pop("kind", None)
         return super().__init__(**data)
 
-    def dict(self, **kwargs: Any) -> Dict[str, Any]:
+    def dict(self, **kwargs: Any) -> dict[str, Any]:
         d = super().dict(**kwargs)
         d["kind"] = self.__class__.__name__.lower()
         return d
 
     if model_serializer is not None:
 
         @model_serializer(mode="wrap")
-        def serialize_root(self, handler, _info) -> Dict:  # type: ignore
+        def serialize_root(self, handler, _info) -> builtins.dict:  # type: ignore
             d = handler(self)
             d["kind"] = self.__class__.__name__.lower()
             return d

src/ome_types/_mixins/_map_mixin.py

@@ -1,4 +1,5 @@
-from typing import TYPE_CHECKING, Any, Dict, Iterator, List, MutableMapping, Optional
+from collections.abc import Iterator, MutableMapping
+from typing import TYPE_CHECKING, Any, Optional
 
 try:
     from pydantic import model_serializer
@@ -13,7 +14,7 @@
 
     class HasMsProtocol(Protocol):
         @property
-        def ms(self) -> List["Map.M"]: ...
+        def ms(self) -> list["Map.M"]: ...
 
 
 class MapMixin(MutableMapping[str, Optional[str]]):
@@ -41,10 +42,10 @@ def __setitem__(self: "HasMsProtocol", key: str, value: Optional[str]) -> None:
 
         self.ms.append(Map.M(k=key, value=value))
 
-    def _pydict(self: "HasMsProtocol", **kwargs: Any) -> Dict[str, str]:
+    def _pydict(self: "HasMsProtocol", **kwargs: Any) -> dict[str, str]:
         return {m.k: m.value for m in self.ms if m.k is not None}
 
-    def dict(self, **kwargs: Any) -> Dict[str, Any]:
+    def dict(self, **kwargs: Any) -> dict[str, Any]:
         return self._pydict()  # type: ignore
 
     if model_serializer is not None:

src/ome_types/_mixins/_ome.py

@@ -2,7 +2,8 @@
 
 import warnings
 import weakref
-from typing import TYPE_CHECKING, Any, BinaryIO, Sequence
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Any, BinaryIO
 
 from ome_types._mixins._base_type import OMEType
 from ome_types._mixins._ids import CONVERTED_IDS