ci: swap poetry to uv and update some pre-commit checks

Author: cryptk

.github/workflows/ci.yml

@@ -29,20 +29,18 @@ jobs:
         python-version:
           - "3.12"
           - "3.13"
-        poetry-version:
-          - "2.2.1"
     steps:
       - uses: actions/checkout@v3
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Set up Poetry
-        uses: abatilo/actions-poetry@v4.0.0
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
       - name: Install Dependencies
-        run: poetry install
+        run: uv sync --all-extras
         shell: bash
       - uses: pre-commit/action@v3.0.0
 
@@ -53,28 +51,26 @@ jobs:
         python-version:
           - "3.12"
           - "3.13"
-        poetry-version:
-          - "2.2.1"
         os:
           - ubuntu-latest
           - windows-latest
           - macOS-latest
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Set up Poetry
-        uses: abatilo/actions-poetry@v4.0.0
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
       - name: Install Dependencies
-        run: poetry install
+        run: uv sync --all-extras
         shell: bash
       - name: Test with Pytest
-        run: poetry run pytest
+        run: uv run pytest
         shell: bash
   release:
     runs-on: ubuntu-latest

.gitignore

@@ -94,12 +94,9 @@ ipython_config.py
 #   install all needed dependencies.
 #Pipfile.lock
 
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
+# uv
+#   uv.lock should be committed to version control for reproducibility
+# uv.lock
 
 # pdm
 #   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.

.pre-commit-config.yaml

@@ -17,10 +17,21 @@ repos:
             -   id: detect-private-key
             -   id: end-of-file-fixer
             -   id: trailing-whitespace
-    -   repo: https://github.com/python-poetry/poetry
-        rev: 2.2.1
+    -   repo: https://github.com/astral-sh/uv-pre-commit
+        # uv version.
+        rev: 0.9.5
         hooks:
-            -   id: poetry-check
+        - id: uv-lock
+    -   repo: https://github.com/codespell-project/codespell
+        rev: v2.4.1
+        hooks:
+            -   id: codespell
+    -   repo: https://github.com/charliermarsh/ruff-pre-commit
+        rev: v0.14.1
+        hooks:
+            - id: ruff-check
+              args: [ --fix ]
+            - id: ruff-format
     -   repo: https://github.com/PyCQA/isort
         rev: 7.0.0
         hooks:
@@ -29,22 +40,11 @@ repos:
         rev: 25.9.0
         hooks:
             -   id: black
-    -   repo: https://github.com/codespell-project/codespell
-        rev: v2.4.1
-        hooks:
-            -   id: codespell
-                exclude: poetry.lock
-    -   repo: https://github.com/charliermarsh/ruff-pre-commit
-        rev: v0.14.1
-        hooks:
-            -   id: ruff
-                args:
-                    - --fix
     -   repo: local
         hooks:
             -   id: pylint
                 name: pylint
-                entry: poetry run pylint
+                entry: uv run pylint
                 language: system
                 types: [python]
                 require_serial: true

poetry.lock

@@ -1,3 +1,2 @@
 class ColorLogicLight:
-
     pass

pyomnilogic_local/colorlogiclight.py

@@ -333,7 +333,7 @@ class MSPSchedule(OmniBase):
     | MSPColorLogicLight
 )
 
-type MSPConfigType = (MSPSystem | MSPEquipmentType)
+type MSPConfigType = MSPSystem | MSPEquipmentType
 
 
 class MSPConfig(BaseModel):

pyomnilogic_local/models/mspconfig.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, SupportsInt, TypeVar, cast, overload
+from typing import Any, SupportsInt, cast, overload
 
 from pydantic import BaseModel, ConfigDict, Field, ValidationError, computed_field
 from xmltodict import parse as xml_parse
@@ -88,7 +88,8 @@ class TelemetryChlorinator(BaseModel):
     operating_mode: ChlorinatorOperatingMode | int = Field(alias="@operatingMode")
     enable: bool = Field(alias="@enable")
 
-    @computed_field
+    @computed_field  # type: ignore[prop-decorator]
+    @property
     def status(self) -> list[str]:
         """Decode status bitmask into a list of active status flag names.
 
@@ -101,7 +102,8 @@ def status(self) -> list[str]:
         """
         return [flag.name for flag in ChlorinatorStatus if self.status_raw & flag.value and flag.name is not None]
 
-    @computed_field
+    @computed_field  # type: ignore[prop-decorator]
+    @property
     def alerts(self) -> list[str]:
         """Decode chlrAlert bitmask into a list of active alert flag names.
 
@@ -131,7 +133,8 @@ def alerts(self) -> list[str]:
 
         return final_flags
 
-    @computed_field
+    @computed_field  # type: ignore[prop-decorator]
+    @property
     def errors(self) -> list[str]:
         """Decode chlrError bitmask into a list of active error flag names.
 
@@ -161,7 +164,8 @@ def errors(self) -> list[str]:
 
         return final_flags
 
-    @computed_field
+    @computed_field  # type: ignore[prop-decorator]
+    @property
     def active(self) -> bool:
         """Check if the chlorinator is actively generating chlorine.
 
@@ -326,15 +330,10 @@ class Telemetry(BaseModel):
 
     @staticmethod
     def load_xml(xml: str) -> Telemetry:
-        TypeVar("KT")
-        TypeVar("VT", SupportsInt, Any)
-
         @overload
         def xml_postprocessor(path: Any, key: Any, value: SupportsInt) -> tuple[Any, SupportsInt]: ...
-
         @overload
         def xml_postprocessor(path: Any, key: Any, value: Any) -> tuple[Any, Any]: ...
-
         def xml_postprocessor(path: Any, key: Any, value: SupportsInt | Any) -> tuple[Any, SupportsInt | Any]:
             """Post process XML to attempt to convert values to int.
 

pyomnilogic_local/models/telemetry.py

@@ -2,5 +2,4 @@
 
 
 class System(OmniEquipment):
-
     pass

pyomnilogic_local/system.py

@@ -19,23 +19,17 @@ dependencies = [
 [project.scripts]
 omnilogic = "pyomnilogic_local.cli.cli:entrypoint"
 
-[tool.poetry]
-packages = [{include = "pyomnilogic_local"}]
-
-[tool.poetry.group.dev.dependencies]
-pre-commit = "^4.0.0"
-mypy = "^1.18.2"
-pylint = "^4.0.0"
-pytest = "^8.0.0"
-pytest-cov = "^7.0.0"
-pytest-asyncio = "^1.2.0"
-
-[tool.poetry.group.cli.dependencies]
-scapy = "^2.6.1"
+[project.optional-dependencies]
+cli = [
+    "scapy>=2.6.1,<3.0.0",
+]
 
 [build-system]
-requires = ["poetry-core>=2.0.0,<3.0.0"]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["pyomnilogic_local"]
 
 [tool.black]
 line-length=140
@@ -140,4 +134,14 @@ line-length = 140
 [tool.semantic_release]
 branch = "main"
 version_toml = "pyproject.toml:project.version"
-build_command = "pip install poetry && poetry build"
+build_command = "pip install hatch && hatch build"
+
+[dependency-groups]
+dev = [
+    "pre-commit>=4.0.0,<5.0.0",
+    "mypy>=1.18.2,<2.0.0",
+    "pylint>=4.0.0,<5.0.0",
+    "pytest>=8.0.0,<9.0.0",
+    "pytest-cov>=7.0.0,<8.0.0",
+    "pytest-asyncio>=1.2.0,<2.0.0",
+]