feat!: TypeVar resolution and Python3.9 EOL

- Add support for resolving subscripted generics and typevars.
- Drop Python3.9 as a supported version.
- Official support for Python3.13

Author: seandstewart

.github/workflows/validate.yml

@@ -2,9 +2,9 @@ name: Validate
 on:
   push:
     branches:
-    - '**'
+      - "**"
     tags-ignore:
-    - '**'
+      - "**"
 
 jobs:
   ci:
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     with:
       runner: ${{ matrix.os }}
       python-version: ${{ matrix.python-version }}

.gitignore

@@ -114,3 +114,4 @@ venv.bak/
 *.DS_Store
 coverage.db
 release-notes.md
+.zed/

Makefile

@@ -47,7 +47,7 @@ test: ## Run this app's tests with a test db. Target a specific path `target=pat
 	$(RUN_PREFIX) pytest $(target) $(TEST_ARGS)
 .PHONY: test
 
-TEST_ARGS ?= --cov --cov-config=.coveragerc --cov-report=xml --cov-report=term --junit-xml=junit.xml
+TEST_ARGS ?=
 
 rule ?= patch
 ref ?= main

pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = "A toolkit for marshalling, unmarshalling, and runtime validation leveraging type annotations."
 authors = [{ name = "Sean Stewart", email = "sean.stewart@hey.com" }]
 readme = "README.md"
-requires-python = "~=3.9"
+requires-python = ">=3.10,<4.0"
 keywords = ["typing", "data", "annotations", "validation", "serdes"]
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -17,10 +17,10 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "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 :: Only",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Utilities",

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+addopts = -vv --cov --cov-config=.coveragerc --cov-report=xml --cov-report=term --junit-xml=junit.xml

src/typelib/marshals/routines.py

@@ -434,7 +434,9 @@ def __call__(self, val: compat.TupleT) -> MarshalledIterableT:
         """
         return [
             routine(v)
-            for routine, v in zip(self.ordered_routines, serdes.itervalues(val))
+            for routine, v in zip(
+                self.ordered_routines, serdes.itervalues(val), strict=False
+            )
         ]
 
 

src/typelib/py/inspection.py

@@ -319,15 +319,23 @@ def get_type_hints(
             Whether to pull type hints from the signature of the object if
             none can be found via [`typing.get_type_hints`][]. (defaults True)
     """
+    tvar_to_type = {}
     try:
-        hints = tp.get_type_hints(obj)
+        t = obj
+        if issubscriptedgeneric(t) and not isforwardref(t):
+            t = obj.__origin__  # type: ignore[attr-defined,union-attr]
+            tvar_to_type = dict(zip(obj.__parameters__, obj.__args__, strict=False))  # type: ignore[attr-defined,union-attr]
+        hints = tp.get_type_hints(t)
     except (NameError, TypeError):
         hints = {}
     # KW_ONLY is a special sentinel to denote kw-only params in a dataclass.
     #  We don't want to do anything with this hint/field. It's not real.
     hints = {f: t for f, t in hints.items() if t is not compat.KW_ONLY}
     if not hints and exhaustive:
         hints = _hints_from_signature(obj)
+
+    for name, annotation in hints.items():
+        hints[name] = tvar_to_type.get(annotation, annotation)
     return hints
 
 
@@ -1489,6 +1497,22 @@ def istypealiastype(t: tp.Any) -> compat.TypeIs[compat.TypeAliasType]:
     return isinstance(t, compat.TypeAliasType)
 
 
+@compat.cache
+def istypevartype(t: tp.Any) -> compat.TypeIs[compat.TypeVar]:
+    """Detect if the given object is a [`typing.TypeAliasType`][].
+
+    Examples:
+        >>> type IntList = list[int]
+        >>> istypealiastype(IntList)
+        True
+        >>> IntList = compat.TypeAliasType("IntList", list[int])
+        >>> istypealiastype(IntList)
+        True
+
+    """
+    return isinstance(t, tp.TypeVar)
+
+
 @compat.cache
 def unwrap(t: tp.Any) -> tp.Any:
     lt = None
@@ -1505,6 +1529,16 @@ def unwrap(t: tp.Any) -> tp.Any:
             t = tv
             continue
 
+        if istypevartype(t):
+            lt = t
+            if t.__bound__:
+                t = t.__bound__
+            elif t.__constraints__:
+                t = tp.Union[t.__constraints__]
+            else:
+                t = tp.Any
+            continue
+
         if hasattr(t, "__supertype__"):
             lt = t
             t = t.__supertype__

src/typelib/serdes.py

@@ -378,7 +378,7 @@ def get_items_iter(tp: type) -> t.Callable[[t.Any], t.Iterable[tuple[t.Any, t.An
 
 
 def _namedtupleitems(val: t.NamedTuple) -> t.Iterable[tuple[str, t.Any]]:
-    return zip(val._fields, val)
+    return zip(val._fields, val, strict=False)
 
 
 def _make_fields_iterator(

src/typelib/unmarshals/routines.py

@@ -933,7 +933,9 @@ def __call__(self, val: tp.Any) -> compat.TupleT:
         decoded = serdes.load(val)
         return self.origin(
             routine(v)
-            for routine, v in zip(self.ordered_routines, serdes.itervalues(decoded))
+            for routine, v in zip(
+                self.ordered_routines, serdes.itervalues(decoded), strict=False
+            )
         )
 
 

tests/models.py

@@ -55,6 +55,16 @@ class TDict(typing.TypedDict):
     value: int
 
 
+IntVar = typing.TypeVar("IntVar", bound=int)
+StrVar = typing.TypeVar("StrVar", bound=str)
+
+
+@dataclasses.dataclass
+class DataGeneric(typing.Generic[StrVar, IntVar]):
+    field: StrVar
+    value: IntVar
+
+
 class GivenEnum(enum.Enum):
     one = "one"
 
@@ -104,3 +114,16 @@ class NestedTypeAliasType:
 Record = compat.TypeAliasType(
     "Record", "dict[str, list[Record] | list[ScalarValue] | Record | ScalarValue]"
 )
+
+
+TVar = typing.TypeVar("TVar", bound=int)
+
+
+@dataclasses.dataclass
+class SimpleGeneric(typing.Generic[TVar]):
+    field: TVar
+
+
+@dataclasses.dataclass
+class NestedGeneric(typing.Generic[TVar]):
+    gen: SimpleGeneric[TVar]