Update dependencies, cleanup mypy, pylint, etc

Author: cryptk

.github/workflows/ci.yml

@@ -27,9 +27,11 @@ jobs:
     strategy:
       matrix:
         python-version:
+          - "3.12"
           - "3.13"
+          - "3.14"
         poetry-version:
-          - "2.0.0"
+          - "2.2.1"
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
@@ -50,9 +52,11 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
+          - "3.12"
           - "3.13"
+          - "3.14"
         poetry-version:
-          - "2.0.0"
+          - "2.2.1"
         os:
           - ubuntu-latest
           - windows-latest

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 exclude: "CHANGELOG.md"
-default_stages: [ commit ]
+default_stages: [ pre-commit ]
 
 repos:
     -   repo: https://github.com/pre-commit/pre-commit-hooks
@@ -53,4 +53,5 @@ repos:
         hooks:
             -   id: mypy
                 exclude: cli.py
-                additional_dependencies: [ "pydantic>=1.10.17" ]
+                additional_dependencies: [ "pydantic>=1.10.17", "pytest>=8.0.0" ]
+                args: [ "--config-file=./pyproject.toml", "--follow-imports=silent", "--strict", "--ignore-missing-imports", "--disallow-subclassing-any", "--no-warn-return-any" ]

poetry.lock

@@ -23,7 +23,6 @@ class Config:
         orm_mode = True
 
     def get_param_by_name(self, name: str) -> int:
-        # pylint: disable=not-an-iterable
         return [param.value for param in self.parameters if param.name == name][0]
 
     @staticmethod

pyomnilogic_local/models/filter_diagnostics.py

@@ -225,7 +225,7 @@ class MSPBackyard(OmniBase):
     colorlogic_light: list[MSPColorLogicLight] | None = Field(alias="ColorLogic-Light")
 
 
-class MSPSchedule(OmniBase):  # type: ignore[override]
+class MSPSchedule(OmniBase):
     omni_type: OmniType = OmniType.SCHEDULE
     system_id: int = Field(alias="schedule-system-id")
     bow_id: int = Field(alias="bow-system-id")

pyomnilogic_local/models/mspconfig.py

@@ -210,7 +210,7 @@ def xml_postprocessor(path: Any, key: Any, value: SupportsInt | Any) -> tuple[An
 
             Pydantic can coerce values natively, but the Omni API returns values as strings of numbers (I.E. "2", "5", etc) and we need them
             coerced into int enums.  Pydantic only seems to be able to handle one coercion, so it could coerce an int into an Enum, but it
-            cannot coerce a string into an int and then into the Enum. We help it out a little bit here by pre-emptively coercing any
+            cannot coerce a string into an int and then into the Enum. We help it out a little bit here by preemptively coercing any
             string ints into an int, then pydantic handles the int to enum coercion if necessary.
             """
             newvalue: SupportsInt | Any

pyomnilogic_local/models/telemetry.py

@@ -21,11 +21,10 @@ def get(self, key: str, default: Any = None) -> Any:
 
 
 F = TypeVar("F", bound=Callable[..., Awaitable[str]])
-TPydanticTypes = Telemetry | MSPConfig | FilterDiagnostics
 
 
 def to_pydantic(
-    pydantic_type: type[TPydanticTypes],
+    pydantic_type: type[Telemetry | MSPConfig | FilterDiagnostics],
 ) -> Callable[..., Any]:
     def inner(func: F, *args: Any, **kwargs: Any) -> F:
         """Wrap an API function that returns XML and parse it into a Pydantic model"""
@@ -34,9 +33,9 @@ def inner(func: F, *args: Any, **kwargs: Any) -> F:
         async def wrapper(*args: Any, raw: Literal[True], **kwargs: Any) -> str: ...
 
         @overload
-        async def wrapper(*args: Any, raw: Literal[False], **kwargs: Any) -> TPydanticTypes: ...
+        async def wrapper(*args: Any, raw: Literal[False], **kwargs: Any) -> Telemetry | MSPConfig | FilterDiagnostics: ...
 
-        async def wrapper(*args: Any, raw: bool = False, **kwargs: Any) -> TPydanticTypes | str:
+        async def wrapper(*args: Any, raw: bool = False, **kwargs: Any) -> Telemetry | MSPConfig | FilterDiagnostics | str:
             resp_body = await func(*args, **kwargs)
             if raw:
                 return resp_body

pyomnilogic_local/models/util.py

@@ -9,11 +9,11 @@ authors = [
 ]
 license = {text = "Apache-2.0"}
 readme = "README.md"
-requires-python = ">=3.10,<3.14"
+requires-python = ">=3.12"
 dependencies = [
-    "pydantic (>=1.10.17)",
-    "xmltodict (>=0.13.0,<0.14.0)",
-    "click (>=8.0.0,<8.1.0)",
+    "pydantic >=1.10.17,<2.0.0",
+    "xmltodict >=0.13.0,<2.0.0",
+    "click >=8.0.0,<8.4.0",
 ]
 
 [project.scripts]
@@ -23,11 +23,11 @@ omnilogic = "pyomnilogic_local.cli.cli:entrypoint"
 packages = [{include = "pyomnilogic_local"}]
 
 [tool.poetry.group.dev.dependencies]
-pre-commit = "^3.8.0"
-mypy = "^1.14.0"
-pylint = "^3.3.3"
+pre-commit = "^4.0.0"
+mypy = "^1.18.2"
+pylint = "^4.0.0"
 pytest = "^8.0.0"
-pytest-cov = "^4.1.0"
+pytest-cov = "^7.0.0"
 pytest-asyncio = "^1.2.0"
 
 [build-system]
@@ -44,7 +44,7 @@ profile = "black"
 [tool.mypy]
 python_version = "3.13"
 plugins = [
-    "pydantic.mypy",
+    "pydantic.v1.mypy",
 ]
 follow_imports = "silent"
 strict = true

pyproject.toml

@@ -90,7 +90,7 @@ def test_datagram_received_queue_overflow(caplog: pytest.LogCaptureFixture) -> N
     assert any("Data queue is full" in r.message for r in caplog.records)
 
 
-@pytest.mark.asyncio  # type: ignore[misc]
+@pytest.mark.asyncio
 async def test_ensure_sent_timeout_and_retry_logs(caplog: pytest.LogCaptureFixture) -> None:
     """Test that _ensure_sent logs retries and raises on repeated timeout."""
     protocol = OmniLogicProtocol()