Drop Python 3.8 and 3.9 support

Update code and type hints to use Python 3.10

Author: HexDecimal

.github/workflows/python-package.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.12"]
+        python-version: ["3.10", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -46,8 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version:
-          ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14-dev"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Removed
+
+- Dropped support for Python 3.8 & 3.9.
+
 ## [5.4.1] - 2025-07-20
 
 Maintenance release

pyproject.toml

@@ -17,7 +17,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dynamic = ["version", "description"]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dependencies = [
     "attrs >=23.1.0",
     "cattrs >=23.1.2",
@@ -34,7 +34,7 @@ test = [
     "pytest >=7.2.0",
     "pytest-cov >=4.0.0",
     "pytest-benchmark >=4.0.0",
-    "mypy >=1.1.1",
+    "mypy >=1.17.0",
 ]
 
 [tool.flit.module]

tcod/ecs/_converter.py

@@ -2,10 +2,13 @@
 
 import functools
 from collections import defaultdict
-from typing import Any, Callable, get_args, get_origin
+from typing import TYPE_CHECKING, Any, get_args, get_origin
 
 import cattrs
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 
 def _is_defaultdict_type(type_hint: object) -> bool:
     """Return True if `type_hint` is a defaultdict type-hint."""

tcod/ecs/callbacks.py

@@ -2,17 +2,16 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, TypeVar, Union
-
-from typing_extensions import TypeAlias
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, TypeAlias, TypeVar
 
 if TYPE_CHECKING:
     from tcod.ecs.entity import Entity
     from tcod.ecs.typing import ComponentKey
 
 _T = TypeVar("_T")
 
-_OnComponentChangedFunc: TypeAlias = Callable[["Entity", Union[_T, None], Union[_T, None]], None]
+_OnComponentChangedFunc: TypeAlias = Callable[["Entity", _T | None, _T | None], None]
 _OnComponentChangedFuncT = TypeVar("_OnComponentChangedFuncT", bound=_OnComponentChangedFunc[Any])
 
 _on_component_changed_callbacks: dict[ComponentKey[Any], list[_OnComponentChangedFunc[Any]]] = {}

tcod/ecs/entity.py

@@ -2,20 +2,13 @@
 
 from __future__ import annotations
 
+from collections.abc import Iterable, Iterator, Mapping, MutableMapping, MutableSet
 from typing import (
     TYPE_CHECKING,
     Any,
     Final,
     Generic,
-    Iterable,
-    Iterator,
-    Mapping,
-    MutableMapping,
-    MutableSet,
-    Tuple,
-    Type,
     TypeVar,
-    Union,
     overload,
 )
 from weakref import WeakKeyDictionary, WeakValueDictionary
@@ -389,7 +382,7 @@ def _traverse_entities(start: Entity, traverse_parents: tuple[object, ...]) -> I
 
 
 @attrs.define(eq=False, frozen=True, weakref_slot=False)
-class EntityComponents(MutableMapping[Union[Type[Any], Tuple[object, Type[Any]]], object]):
+class EntityComponents(MutableMapping[type[Any] | tuple[object, type[Any]], object]):
     """A proxy attribute to access an entities components like a dictionary.
 
     See :any:`Entity.components`.

tcod/ecs/query.py

@@ -5,7 +5,7 @@
 import itertools
 import warnings
 from collections import defaultdict
-from typing import TYPE_CHECKING, Any, Iterable, Iterator, Protocol, TypeVar, overload
+from typing import TYPE_CHECKING, Any, Protocol, TypeVar, overload
 from weakref import WeakKeyDictionary, WeakSet
 
 import attrs
@@ -15,6 +15,7 @@
 from tcod.ecs.constants import IsA
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable, Iterator
     from collections.abc import Set as AbstractSet
 
     from tcod.ecs.entity import Entity
@@ -471,7 +472,7 @@ def __getitem__(self, key: tuple[ComponentKey[object], ...]) -> Iterable[tuple[A
                 continue
             registry_components = self.registry._components_by_type[component_key]
             entity_components.append([registry_components[entity] for entity in entities])
-        return zip(*entity_components)
+        return zip(*entity_components, strict=True)
 
 
 WorldQuery = BoundQuery

tcod/ecs/registry.py

@@ -4,7 +4,8 @@
 
 import warnings
 from collections import defaultdict
-from typing import TYPE_CHECKING, Any, DefaultDict, Dict, Final, Iterable, Mapping, NoReturn, Set, TypeVar
+from collections.abc import Iterable, Mapping
+from typing import TYPE_CHECKING, Any, Final, NoReturn, TypeVar
 
 import attrs
 from typing_extensions import deprecated
@@ -195,23 +196,23 @@ def __setstate__(self, state: dict[str, Any]) -> None:
         # Apply defaultdict types to unpickled dictionaries
         self._components_by_type = converter.structure(
             state.pop("_components_by_type"),
-            DefaultDict[Any, Dict[Any, Any]],
+            defaultdict[Any, dict[Any, Any]],
         )
         self._components_by_entity = _components_by_entity_from(self._components_by_type)
 
         self._tags_by_entity = converter.structure(
             state.pop("_tags_by_entity"),
-            DefaultDict[Any, Set[Any]],
+            defaultdict[Any, set[Any]],
         )
         self._tags_by_key = _tags_by_key_from_tags_by_entity(self._tags_by_entity)
 
         self._relation_tags_by_entity = converter.structure(
             state.pop("_relation_tags_by_entity"),
-            DefaultDict[Any, DefaultDict[Any, Set[Any]]],
+            defaultdict[Any, defaultdict[Any, set[Any]]],
         )
         self._relation_components_by_entity = converter.structure(
             state.pop("_relation_components_by_entity"),
-            DefaultDict[Any, DefaultDict[Any, Dict[Any, Any]]],
+            defaultdict[Any, defaultdict[Any, dict[Any, Any]]],
         )
         self._relations_lookup = _relations_lookup_from(
             self._relation_tags_by_entity, self._relation_components_by_entity
@@ -231,11 +232,11 @@ def __getstate__(self) -> dict[str, Any]:
         converter = tcod.ecs._converter._get_converter()
         # Replace defaultdict types with plain dict when saving
         return {
-            "_components_by_type": converter.structure(self._components_by_type, Dict[Any, Dict[Any, Any]]),
-            "_tags_by_entity": converter.structure(self._tags_by_entity, Dict[Any, Any]),
-            "_relation_tags_by_entity": converter.structure(self._relation_tags_by_entity, Dict[Any, Dict[Any, Any]]),
+            "_components_by_type": converter.structure(self._components_by_type, dict[Any, dict[Any, Any]]),
+            "_tags_by_entity": converter.structure(self._tags_by_entity, dict[Any, Any]),
+            "_relation_tags_by_entity": converter.structure(self._relation_tags_by_entity, dict[Any, dict[Any, Any]]),
             "_relation_components_by_entity": converter.structure(
-                self._relation_components_by_entity, Dict[Any, Dict[Any, Any]]
+                self._relation_components_by_entity, dict[Any, dict[Any, Any]]
             ),
             "_names_by_name": self._names_by_name,
         }

tcod/ecs/typing.py

@@ -2,11 +2,8 @@
 
 from __future__ import annotations
 
-import sys
-import types
-from typing import TYPE_CHECKING, Any, Tuple, Type, TypeVar, Union
-
-from typing_extensions import TypeAlias
+from types import EllipsisType
+from typing import TYPE_CHECKING, Any, TypeAlias, TypeVar
 
 if TYPE_CHECKING:
     from tcod.ecs.entity import Entity
@@ -15,23 +12,19 @@
     Entity = Any
     BoundQuery = Any
 
-if sys.version_info >= (3, 10):  # pragma: no cover
-    EllipsisType: TypeAlias = types.EllipsisType
-else:  # pragma: no cover
-    EllipsisType = Any
 
 _T = TypeVar("_T")
 
-ComponentKey: TypeAlias = Union[Type[_T], Tuple[object, Type[_T]]]
+ComponentKey: TypeAlias = type[_T] | tuple[object, type[_T]]
 """ComponentKey is plain `type` or tuple `(tag, type)`."""
 
-_RelationTargetLookup: TypeAlias = Union[Entity, EllipsisType]
+_RelationTargetLookup: TypeAlias = Entity | EllipsisType
 """Possible target for stored relations."""
 
-_RelationQueryTarget: TypeAlias = Union[_RelationTargetLookup, BoundQuery]
+_RelationQueryTarget: TypeAlias = _RelationTargetLookup | BoundQuery
 """Possible target for relation queries."""
 
-_RelationQuery: TypeAlias = Union[Tuple[object, _RelationQueryTarget], Tuple[_RelationQueryTarget, object, None]]  # noqa: PYI047
+_RelationQuery: TypeAlias = tuple[object, _RelationQueryTarget] | tuple[_RelationQueryTarget, object, None]  # noqa: PYI047
 """Query format for relations.
 
 One of 4 formats:

tests/test_ecs.py

@@ -6,7 +6,7 @@
 import pickle
 import pickletools
 import sys
-from typing import Callable, Iterator
+from collections.abc import Callable, Iterator  # noqa: TC003
 
 import pytest