Merge pull request #223 from DanCardin/dc/3.14

feat: Test against python 3.14.

Author: DanCardin

.github/workflows/test.yml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
-        pydantic-version: ["1.0", "2.0"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        pydantic-version: ["1.0", ""]
 
         # No need to matrix test pydantic versions. But the matrix syntax still
         # keeps the file DRY.
@@ -28,12 +28,14 @@ jobs:
             pydantic-version: "1.0"
           - python-version: "3.9"
             pydantic-version: "1.0"
-          - python-version: "3.11"
+          - python-version: "3.10"
             pydantic-version: "1.0"
-          - python-version: "3.12"
+          - python-version: "3.11"
             pydantic-version: "1.0"
           - python-version: "3.13"
             pydantic-version: "1.0"
+          - python-version: "3.14"
+            pydantic-version: "1.0"
 
     env:
       UV_CACHE_DIR: /tmp/.uv-cache
@@ -63,7 +65,8 @@ jobs:
       - name: Minimize uv cache
         run: uv cache prune --ci
 
-      - name: Install pydantic matrix version
+      - if: ${{ matrix.pydantic-version != '' }}
+        name: Install pydantic matrix version
         run: uv pip install 'pydantic~=${{ matrix.pydantic-version }}'
 
       - name: Run Linters

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ## Unreleased: 0.29.0
 
+- feat: Test against python 3.14.
+- fix: Apply pyright strict typing.
 - fix: Function callables ability to depend on implicit Deps.
 - docs: Improve docs relating to `Output`.
 ## 0.28

pyproject.toml

@@ -35,7 +35,7 @@ dev-dependencies = [
     "types-docutils >= 0.20.0",
 
     "attrs",
-    "pydantic",
+    "pydantic; python_version < '3.14'",
     "msgspec >= 0.19.0; python_version >= '3.9'",
 ]
 

src/cappa/class_inspect.py

@@ -204,8 +204,8 @@ def from_cls(cls, obj: type) -> ClassTypes | None:
             return cls.msgspec
 
         try:
-            import pydantic
-            from pydantic import BaseModel
+            import pydantic  # pyright: ignore
+            from pydantic import BaseModel  # pyright: ignore
         except ImportError:  # pragma: no cover
             pass
         else:
@@ -215,7 +215,7 @@ def from_cls(cls, obj: type) -> ClassTypes | None:
                 is_base_model = False
 
             if is_base_model:
-                if pydantic.__version__.startswith("1."):
+                if pydantic.__version__.startswith("1."):  # pyright: ignore
                     return cls.pydantic_v1
                 return cls.pydantic_v2
 

tests/test_pydantic.py

@@ -1,52 +1,48 @@
 from __future__ import annotations
 
+import sys
 from typing import Optional
 
-from pydantic import BaseModel, dataclasses
 from typing_extensions import Annotated
 
 import cappa
 from tests.utils import Backend, backends, parse
 
+if sys.version_info < (3, 14):
+    from pydantic import BaseModel, dataclasses
 
-class PydanticCommand(BaseModel):
-    name: str
-    foo: Annotated[int, cappa.Arg(short=True)]
+    class PydanticCommand(BaseModel):
+        name: str
+        foo: Annotated[int, cappa.Arg(short=True)]
 
+    @backends
+    def test_base_model(backend: Backend):
+        result = parse(PydanticCommand, "meow", "-f", "4", backend=backend)
+        assert result == PydanticCommand(name="meow", foo=4)
 
-@backends
-def test_base_model(backend: Backend):
-    result = parse(PydanticCommand, "meow", "-f", "4", backend=backend)
-    assert result == PydanticCommand(name="meow", foo=4)
+    @dataclasses.dataclass
+    class DataclassCommand:
+        name: str
+        foo: Annotated[int, cappa.Arg(short=True)]
 
+    @backends
+    def test_dataclass(backend: Backend):
+        result = parse(DataclassCommand, "meow", "-f", "4", backend=backend)
+        assert result == DataclassCommand(name="meow", foo=4)
 
-@dataclasses.dataclass
-class DataclassCommand:
-    name: str
-    foo: Annotated[int, cappa.Arg(short=True)]
+    class OptSub(BaseModel):
+        name: Optional[str] = None
 
+    class OptionalSubcommand(BaseModel):
+        sub: cappa.Subcommands[Optional[OptSub]] = None
 
-@backends
-def test_dataclass(backend: Backend):
-    result = parse(DataclassCommand, "meow", "-f", "4", backend=backend)
-    assert result == DataclassCommand(name="meow", foo=4)
+    @backends
+    def test_optional_subcommand(backend: Backend):
+        result = parse(OptionalSubcommand, backend=backend)
+        assert result == OptionalSubcommand(sub=None)
 
+        result = parse(OptionalSubcommand, "opt-sub", backend=backend)
+        assert result == OptionalSubcommand(sub=OptSub(name=None))
 
-class OptSub(BaseModel):
-    name: Optional[str] = None
-
-
-class OptionalSubcommand(BaseModel):
-    sub: cappa.Subcommands[Optional[OptSub]] = None
-
-
-@backends
-def test_optional_subcommand(backend: Backend):
-    result = parse(OptionalSubcommand, backend=backend)
-    assert result == OptionalSubcommand(sub=None)
-
-    result = parse(OptionalSubcommand, "opt-sub", backend=backend)
-    assert result == OptionalSubcommand(sub=OptSub(name=None))
-
-    result = parse(OptionalSubcommand, "opt-sub", "foo", backend=backend)
-    assert result == OptionalSubcommand(sub=OptSub(name="foo"))
+        result = parse(OptionalSubcommand, "opt-sub", "foo", backend=backend)
+        assert result == OptionalSubcommand(sub=OptSub(name="foo"))