Merge branch 'main' into py_3_14

Author: Lash-L

.github/workflows/ci.yml

@@ -40,16 +40,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Set up Python
-        uses: actions/setup-python@v6
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
-      - uses: snok/install-poetry@v1.4.1
-      - name: Install Dependencies
-        run: poetry install
-        shell: bash
+          activate-environment: true
+      - run: uv pip install pip
       - name: Test with Pytest
-        run: poetry run pytest --log-cli-level=DEBUG -vv -s
+        run:  uv run pytest --log-cli-level=DEBUG -vv -s
         shell: bash
   release:
     runs-on: ubuntu-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
@@ -17,16 +17,17 @@ repos:
             -   id: detect-private-key
             -   id: end-of-file-fixer
             -   id: trailing-whitespace
-    -   repo: https://github.com/python-poetry/poetry
-        rev: 1.7.1
+    -   repo: https://github.com/astral-sh/uv-pre-commit
+        rev: 0.9.1
         hooks:
-            -   id: poetry-check
+          - id: uv-sync
+            args: ["--locked", "--all-packages"]
     -   repo: https://github.com/codespell-project/codespell
         rev: v2.2.6
         hooks:
             -   id: codespell
     -   repo: https://github.com/charliermarsh/ruff-pre-commit
-        rev: v0.1.8
+        rev: v0.13.2
         hooks:
             -   id: ruff-format
             -   id: ruff

poetry.lock

@@ -1,62 +1,74 @@
-[tool.poetry]
+[project]
 name = "python-roborock"
 version = "2.54.0"
 description = "A package to control Roborock vacuums."
-authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
-license = "GPL-3.0-only"
+authors = [{ name = "humbertogontijo", email = "humbertogontijo@users.noreply.github.com" }, {name="Lash-L"}, {name="allenporter"}]
+requires-python = ">=3.11, <4"
 readme = "README.md"
-repository = "https://github.com/humbertogontijo/python-roborock"
-documentation = "https://python-roborock.readthedocs.io/"
+license = "GPL-3.0-only"
+keywords = [
+    "roborock",
+    "vacuum",
+    "homeassistant",
+]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Topic :: Software Development :: Libraries",
 ]
-packages = [{include = "roborock"}]
-keywords = ["roborock", "vacuum", "homeassistant"]
+dependencies = [
+    "click>=8",
+    "aiohttp>=3.8.2,<4",
+    "pycryptodome~=3.18",
+    "pycryptodomex~=3.18 ; sys_platform == 'darwin'",
+    "paho-mqtt>=1.6.1,<3.0.0",
+    "construct>=2.10.57,<3",
+    "vacuum-map-parser-roborock",
+    "pyrate-limiter>=3.7.0,<4",
+    "aiomqtt>=2.3.2,<3",
+    "click-shell~=2.1",
+]
+
+[project.urls]
+Repository = "https://github.com/humbertogontijo/python-roborock"
+Documentation = "https://python-roborock.readthedocs.io/"
 
-[tool.poetry.scripts]
+[project.scripts]
 roborock = "roborock.cli:main"
 
-[tool.poetry.dependencies]
-python = "^3.11"
-click = ">=8"
-aiohttp = "^3.8.2"
-async-timeout = "*"
-pycryptodome = "^3.18"
-pycryptodomex = {version = "^3.18", markers = "sys_platform == 'darwin'"}
-paho-mqtt = ">=1.6.1,<3.0.0"
-construct = "^2.10.57"
-vacuum-map-parser-roborock = "*"
-pyrate-limiter = "^3.7.0"
-aiomqtt = "^2.3.2"
-click-shell = "^2.1"
+[dependency-groups]
+dev = [
+    "pytest-asyncio>=1.1.0",
+    "pytest",
+    "pre-commit>=3.5,<5.0",
+    "mypy",
+    "ruff==0.13.2",
+    "codespell",
+    "pyshark>=0.6,<0.7",
+    "aioresponses>=0.7.7,<0.8",
+    "freezegun>=1.5.1,<2",
+    "pytest-timeout>=2.3.1,<3",
+    "syrupy>=4.9.1,<5",
+    "pdoc>=15.0.4,<16",
+]
 
+[tool.hatch.build.targets.sdist]
+include = ["roborock"]
 
-[build-system]
-requires = ["poetry-core==1.8.0"]
-build-backend = "poetry.core.masonry.api"
+[tool.hatch.build.targets.wheel]
+include = ["roborock"]
 
-[tool.poetry.group.dev.dependencies]
-pytest-asyncio = ">=1.1.0"
-pytest = "*"
-pre-commit = ">=3.5,<5.0"
-mypy = "*"
-ruff = "*"
-codespell = "*"
-pyshark = "^0.6"
-aioresponses = "^0.7.7"
-freezegun = "^1.5.1"
-pytest-timeout = "^2.3.1"
-syrupy = "^4.9.1"
-pdoc = "^15.0.4"
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [tool.semantic_release]
 branch = "main"
 version_toml = ["pyproject.toml:tool.poetry.version"]
 build_command = "pip install poetry && poetry build"
+
 [tool.semantic_release.commit_parser_options]
 allowed_tags = [
     "chore",
@@ -68,9 +80,9 @@ allowed_tags = [
 major_tags= ["refactor"]
 
 [tool.ruff]
-ignore = ["F403", "E741"]
+lint.ignore = ["F403", "E741"]
 line-length = 120
-select=["E", "F", "UP", "I"]
+lint.select=["E", "F", "UP", "I"]
 
 [tool.ruff.lint.per-file-ignores]
 "*/__init__.py" = ["F401"]

pyproject.toml

@@ -83,7 +83,7 @@ async def _wait_response(self, request_id: int, queue: RoborockFuture) -> Any:
             if response == "unknown_method":
                 raise UnknownMethodError("Unknown method")
             return response
-        except (asyncio.TimeoutError, asyncio.CancelledError):
+        except (TimeoutError, asyncio.CancelledError):
             raise RoborockTimeout(f"id={request_id} Timeout after {self.queue_timeout} seconds") from None
         finally:
             self._waiting_queue.pop(request_id, None)

roborock/api.py

@@ -5,7 +5,6 @@
 import re
 import types
 from dataclasses import asdict, dataclass, field
-from datetime import timezone
 from enum import Enum
 from functools import cached_property
 from typing import Any, NamedTuple, get_args, get_origin
@@ -717,11 +716,11 @@ def square_meter_area(self) -> float | None:
 
     @property
     def begin_datetime(self) -> datetime.datetime | None:
-        return datetime.datetime.fromtimestamp(self.begin).astimezone(timezone.utc) if self.begin else None
+        return datetime.datetime.fromtimestamp(self.begin).astimezone(datetime.UTC) if self.begin else None
 
     @property
     def end_datetime(self) -> datetime.datetime | None:
-        return datetime.datetime.fromtimestamp(self.end).astimezone(timezone.utc) if self.end else None
+        return datetime.datetime.fromtimestamp(self.end).astimezone(datetime.UTC) if self.end else None
 
     def __repr__(self) -> str:
         return _attr_repr(self)

roborock/containers.py

@@ -29,16 +29,14 @@
 async def send_decoded_command(
     mqtt_channel: MqttChannel,
     params: dict[RoborockDyadDataProtocol, Any],
-) -> dict[RoborockDyadDataProtocol, Any]:
-    ...
+) -> dict[RoborockDyadDataProtocol, Any]: ...
 
 
 @overload
 async def send_decoded_command(
     mqtt_channel: MqttChannel,
     params: dict[RoborockZeoProtocol, Any],
-) -> dict[RoborockZeoProtocol, Any]:
-    ...
+) -> dict[RoborockZeoProtocol, Any]: ...
 
 
 async def send_decoded_command(

roborock/devices/a01_channel.py

@@ -42,7 +42,7 @@ def __init__(self, trait: Trait) -> None:
         """
         for item in fields(self):
             trait_type = _get_trait_type(item)
-            if trait_type == type(trait):
+            if trait_type is type(trait):
                 setattr(self, item.name, trait)
                 break
 

roborock/devices/traits/traits_mixin.py

@@ -1,4 +1,5 @@
 """Trait for fetching the map content from Roborock devices."""
+
 import logging
 from dataclasses import dataclass
 

roborock/devices/traits/v1/map_content.py

@@ -4,6 +4,7 @@
 with maps and rooms, such as map names and room names. These override the
 base container datatypes to add additional fields.
 """
+
 import logging
 from typing import Self