Update poetry locks and pre-commit hooks (#837)

Also updates CI pypy versions to be 3.9 and 3.10 which are the currently
[supported
versions](https://www.pypy.org/posts/2024/01/pypy-v7315-release.html).
Otherwise latest cryptography doesn't ship with pypy3.8 wheels and is
unable to build on windows.

Also updates the `codecov-action` to v4 which fixed some intermittent
uploading errors.

.github/workflows/ci.yml

@@ -61,7 +61,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.8", "pypy-3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.9", "pypy-3.10"]
         os: [ubuntu-latest, macos-latest, windows-latest]
         extras: [false, true]
         exclude:
@@ -70,7 +70,7 @@ jobs:
           - os: windows-latest
             extras: true
           - os: ubuntu-latest
-            python-version: "pypy-3.8"
+            python-version: "pypy-3.9"
             extras: true
           - os: ubuntu-latest
             python-version: "pypy-3.10"
@@ -102,6 +102,6 @@ jobs:
         run: |
           poetry run pytest --cov kasa --cov-report xml
       - name: "Upload coverage to Codecov"
-        uses: "codecov/codecov-action@v3"
+        uses: "codecov/codecov-action@v4"
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.6.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
@@ -10,14 +10,14 @@ repos:
   - id: check-ast
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.1.3
+  rev: v0.3.7
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
     - id: ruff-format
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.3.0
+  rev: v1.9.0
   hooks:
   - id: mypy
     additional_dependencies: [types-click]

devtools/bench/utils/data.py

@@ -1,6 +1,5 @@
 """Test data for benchmarks."""
 
-
 import json
 
 from .original import OriginalTPLinkSmartHomeProtocol

devtools/bench/utils/original.py

@@ -1,4 +1,5 @@
 """Original implementation of the TP-Link Smart Home protocol."""
+
 import struct
 from typing import Generator
 

devtools/dump_devinfo.py

@@ -7,6 +7,7 @@ If you have new, yet unsupported device or a device with no devinfo file under
 Executing this script will several modules and methods one by one,
 and finally execute a query to query all of them at once.
 """
+
 import base64
 import collections.abc
 import json

devtools/generate_supported.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Script that checks supported devices and updates README.md and SUPPORTED.md."""
+
 import json
 import os
 import sys

devtools/perftest.py

@@ -1,4 +1,5 @@
 """Script for testing update performance on devices."""
+
 import asyncio
 import time
 

kasa/__init__.py

@@ -11,6 +11,7 @@ For device type specific actions `SmartBulb`, `SmartPlug`, or `SmartStrip`
 Module-specific errors are raised as `KasaException` and are expected
 to be handled by the user of the library.
 """
+
 from importlib.metadata import version
 from typing import TYPE_CHECKING
 from warnings import warn

kasa/aestransport.py

@@ -3,6 +3,7 @@
 Based on the work of https://github.com/petretiandrea/plugp100
 under compatible GNU GPL3 license.
 """
+
 import asyncio
 import base64
 import hashlib

kasa/bulb.py

@@ -1,4 +1,5 @@
 """Module for Device base class."""
+
 from abc import ABC, abstractmethod
 from typing import Dict, List, NamedTuple, Optional
 

kasa/cli.py

@@ -1,4 +1,5 @@
 """python-kasa cli tool."""
+
 import ast
 import asyncio
 import json

kasa/device.py

@@ -1,4 +1,5 @@
 """Module for Device base class."""
+
 import logging
 from abc import ABC, abstractmethod
 from dataclasses import dataclass

kasa/device_factory.py

@@ -1,4 +1,5 @@
 """Device creation via DeviceConfig."""
+
 import logging
 import time
 from typing import Any, Dict, Optional, Tuple, Type

kasa/device_type.py

@@ -1,6 +1,5 @@
 """TP-Link device types."""
 
-
 from enum import Enum
 
 

kasa/deviceconfig.py

@@ -1,4 +1,5 @@
 """Module for holding connection parameters."""
+
 import logging
 from dataclasses import asdict, dataclass, field, fields, is_dataclass
 from enum import Enum

kasa/discover.py

@@ -1,4 +1,5 @@
 """Discovery module for TP-Link Smart Home devices."""
+
 import asyncio
 import binascii
 import ipaddress

kasa/emeterstatus.py

@@ -1,4 +1,5 @@
 """Module for emeter container."""
+
 import logging
 from typing import Optional
 

kasa/exceptions.py

@@ -1,4 +1,5 @@
 """python-kasa exceptions."""
+
 from asyncio import TimeoutError as _asyncioTimeoutError
 from enum import IntEnum
 from typing import Any, Optional

kasa/feature.py

@@ -1,4 +1,5 @@
 """Generic interface for defining device features."""
+
 from dataclasses import dataclass
 from enum import Enum, auto
 from typing import TYPE_CHECKING, Any, Callable, Optional, Union

kasa/httpclient.py

@@ -1,4 +1,5 @@
 """Module for HttpClientSession class."""
+
 import asyncio
 import logging
 from typing import Any, Dict, Optional, Tuple, Union

kasa/iot/__init__.py

@@ -1,4 +1,5 @@
 """Package for supporting legacy kasa devices."""
+
 from .iotbulb import IotBulb
 from .iotdevice import IotDevice
 from .iotdimmer import IotDimmer

kasa/iot/iotbulb.py

@@ -1,4 +1,5 @@
 """Module for bulbs (LB*, KL*, KB*)."""
+
 import logging
 import re
 from enum import Enum
@@ -233,7 +234,6 @@ class IotBulb(IotDevice, Bulb):
                 )
             )
 
-
     @property  # type: ignore
     @requires_update
     def is_color(self) -> bool:

kasa/iot/iotdevice.py

@@ -11,6 +11,7 @@ Stroetmann which is licensed under the Apache License, Version 2.0.
 You may obtain a copy of the license at
 http://www.apache.org/licenses/LICENSE-2.0
 """
+
 import collections.abc
 import functools
 import inspect

kasa/iot/iotdimmer.py

@@ -1,4 +1,5 @@
 """Module for dimmers (currently only HS220)."""
+
 from enum import Enum
 from typing import Any, Dict, Optional
 

kasa/iot/iotlightstrip.py

@@ -1,4 +1,5 @@
 """Module for light strips (KL430)."""
+
 from typing import Dict, List, Optional
 
 from ..device_type import DeviceType

kasa/iot/iotmodule.py

@@ -1,4 +1,5 @@
 """Base class for IOT module implementations."""
+
 import collections
 import logging
 

kasa/iot/iotplug.py

@@ -1,4 +1,5 @@
 """Module for smart plugs (HS100, HS110, ..)."""
+
 import logging
 from typing import Optional
 

kasa/iot/iotstrip.py

@@ -1,4 +1,5 @@
 """Module for multi-socket devices (HS300, HS107, KP303, ..)."""
+
 import logging
 from collections import defaultdict
 from datetime import datetime, timedelta

kasa/iot/modules/__init__.py

@@ -1,4 +1,5 @@
 """Module for individual feature modules."""
+
 from .ambientlight import AmbientLight
 from .antitheft import Antitheft
 from .cloud import Cloud

kasa/iot/modules/ambientlight.py

@@ -1,4 +1,5 @@
 """Implementation of the ambient light (LAS) module found in some dimmers."""
+
 from ...feature import Feature, FeatureType
 from ..iotmodule import IotModule, merge
 

kasa/iot/modules/antitheft.py

@@ -1,4 +1,5 @@
 """Implementation of the antitheft module."""
+
 from .rulemodule import RuleModule
 
 

kasa/iot/modules/cloud.py

@@ -1,4 +1,5 @@
 """Cloud module implementation."""
+
 try:
     from pydantic.v1 import BaseModel
 except ImportError:

kasa/iot/modules/countdown.py

@@ -1,4 +1,5 @@
 """Implementation for the countdown timer."""
+
 from .rulemodule import RuleModule
 
 

kasa/iot/modules/emeter.py

@@ -1,4 +1,5 @@
 """Implementation of the emeter module."""
+
 from datetime import datetime
 from typing import Dict, List, Optional, Union
 

kasa/iot/modules/motion.py

@@ -1,4 +1,5 @@
 """Implementation of the motion detection (PIR) module found in some dimmers."""
+
 from enum import Enum
 from typing import Optional
 

kasa/iot/modules/rulemodule.py

@@ -1,4 +1,5 @@
 """Base implementation for all rule-based modules."""
+
 import logging
 from enum import Enum
 from typing import Dict, List, Optional

kasa/iot/modules/schedule.py

@@ -1,4 +1,5 @@
 """Schedule module implementation."""
+
 from .rulemodule import RuleModule
 
 

kasa/iot/modules/time.py

@@ -1,4 +1,5 @@
 """Provides the current time and timezone information."""
+
 from datetime import datetime
 
 from ...exceptions import KasaException

kasa/iot/modules/usage.py

@@ -1,4 +1,5 @@
 """Implementation of the usage interface."""
+
 from datetime import datetime
 from typing import Dict
 

kasa/iotprotocol.py

@@ -1,4 +1,5 @@
 """Module for the IOT legacy IOT KASA protocol."""
+
 import asyncio
 import logging
 from typing import Dict, Optional, Union

kasa/module.py

@@ -1,4 +1,5 @@
 """Base class for all module implementations."""
+
 import logging
 from abc import ABC, abstractmethod
 from typing import Dict

kasa/plug.py

@@ -1,4 +1,5 @@
 """Module for a TAPO Plug."""
+
 import logging
 from abc import ABC
 

kasa/protocol.py

@@ -9,6 +9,7 @@ https://github.com/softScheck/tplink-smartplug/
 which are licensed under the Apache License, Version 2.0
 http://www.apache.org/licenses/LICENSE-2.0
 """
+
 import base64
 import errno
 import hashlib

kasa/smart/__init__.py

@@ -1,4 +1,5 @@
 """Package for supporting tapo-branded and newer kasa devices."""
+
 from .smartbulb import SmartBulb
 from .smartchilddevice import SmartChildDevice
 from .smartdevice import SmartDevice

kasa/smart/modules/__init__.py

@@ -1,4 +1,5 @@
 """Modules for SMART devices."""
+
 from .alarmmodule import AlarmModule
 from .autooffmodule import AutoOffModule
 from .battery import BatterySensor

kasa/smart/modules/alarmmodule.py

@@ -1,4 +1,5 @@
 """Implementation of alarm module."""
+
 from typing import TYPE_CHECKING, Dict, List, Optional
 
 from ...feature import Feature, FeatureType

kasa/smart/modules/autooffmodule.py

@@ -1,4 +1,5 @@
 """Implementation of auto off module."""
+
 from datetime import datetime, timedelta
 from typing import TYPE_CHECKING, Dict, Optional
 

kasa/smart/modules/battery.py

@@ -1,4 +1,5 @@
 """Implementation of battery module."""
+
 from typing import TYPE_CHECKING
 
 from ...feature import Feature, FeatureType

kasa/smart/modules/brightness.py

@@ -1,4 +1,5 @@
 """Implementation of brightness module."""
+
 from typing import TYPE_CHECKING, Dict
 
 from ...feature import Feature, FeatureType

kasa/smart/modules/cloudmodule.py

@@ -1,4 +1,5 @@
 """Implementation of cloud module."""
+
 from typing import TYPE_CHECKING
 
 from ...feature import Feature, FeatureType

kasa/smart/modules/colortemp.py

@@ -1,4 +1,5 @@
 """Implementation of color temp module."""
+
 from typing import TYPE_CHECKING, Dict
 
 from ...bulb import ColorTempRange

kasa/smart/modules/devicemodule.py

@@ -1,4 +1,5 @@
 """Implementation of device module."""
+
 from typing import Dict
 
 from ..smartmodule import SmartModule

kasa/smart/modules/energymodule.py

@@ -1,4 +1,5 @@
 """Implementation of energy monitoring module."""
+
 from typing import TYPE_CHECKING, Dict, Optional
 
 from ...emeterstatus import EmeterStatus

kasa/smart/modules/firmware.py

@@ -1,4 +1,5 @@
 """Implementation of firmware module."""
+
 from typing import TYPE_CHECKING, Dict, Optional
 
 from ...exceptions import SmartErrorCode

kasa/smart/modules/humidity.py

@@ -1,4 +1,5 @@
 """Implementation of humidity module."""
+
 from typing import TYPE_CHECKING
 
 from ...feature import Feature, FeatureType

kasa/smart/modules/ledmodule.py

@@ -1,4 +1,5 @@
 """Module for led controls."""
+
 from typing import TYPE_CHECKING, Dict
 
 from ...feature import Feature, FeatureType

kasa/smart/modules/lighttransitionmodule.py

@@ -1,4 +1,5 @@
 """Module for smooth light transitions."""
+
 from typing import TYPE_CHECKING
 
 from ...exceptions import KasaException

kasa/smart/modules/reportmodule.py

@@ -1,4 +1,5 @@
 """Implementation of report module."""
+
 from typing import TYPE_CHECKING
 
 from ...feature import Feature

kasa/smart/modules/temperature.py

@@ -1,4 +1,5 @@
 """Implementation of temperature module."""
+
 from typing import TYPE_CHECKING, Literal
 
 from ...feature import Feature, FeatureType

kasa/smart/modules/timemodule.py

@@ -1,4 +1,5 @@
 """Implementation of time module."""
+
 from datetime import datetime, timedelta, timezone
 from time import mktime
 from typing import TYPE_CHECKING, cast

kasa/smart/smartbulb.py

@@ -1,4 +1,5 @@
 """Module for tapo-branded smart bulbs (L5**)."""
+
 from typing import Dict, List, Optional
 
 from ..bulb import Bulb

kasa/smart/smartchilddevice.py

@@ -1,4 +1,5 @@
 """Child device implementation."""
+
 import logging
 from typing import Optional
 

kasa/smart/smartdevice.py

@@ -1,4 +1,5 @@
 """Module for a SMART device."""
+
 import base64
 import logging
 from datetime import datetime, timedelta

kasa/smart/smartmodule.py

@@ -1,4 +1,5 @@
 """Base implementation for SMART modules."""
+
 import logging
 from typing import TYPE_CHECKING, Dict, Type
 

kasa/tests/fakeprotocol_iot.py

@@ -302,9 +302,9 @@ class FakeIotProtocol(IotProtocol):
 
     def set_preferred_state(self, new_state, *args):
         """Implement set_preferred_state."""
-        self.proto["system"]["get_sysinfo"]["preferred_state"][
+        self.proto["system"]["get_sysinfo"]["preferred_state"][new_state["index"]] = (
-            new_state["index"]
+            new_state
-        ] = new_state
+        )
 
     def light_state(self, x, *args):
         light_state = self.proto["system"]["get_sysinfo"]["light_state"]

kasa/tests/fixtureinfo.py

@@ -15,7 +15,7 @@ class FixtureInfo(NamedTuple):
     data: Dict
 
 
-FixtureInfo.__hash__ = lambda x: hash((x.name, x.protocol))  # type: ignore[attr-defined, method-assign]
+FixtureInfo.__hash__ = lambda self: hash((self.name, self.protocol))  # type: ignore[attr-defined, method-assign]
 FixtureInfo.__eq__ = lambda x, y: hash(x) == hash(y)  # type: ignore[method-assign]
 
 

kasa/tests/test_device.py

@@ -1,4 +1,5 @@
 """Tests for all devices."""
+
 import importlib
 import inspect
 import pkgutil

kasa/tests/test_iotdevice.py

@@ -1,4 +1,5 @@
 """Module for common iotdevice tests."""
+
 import re
 from datetime import datetime
 

kasa/tests/test_smartdevice.py

@@ -1,4 +1,5 @@
 """Tests for SMART devices."""
+
 import logging
 from typing import Any, Dict
 

kasa/xortransport.py

@@ -9,6 +9,7 @@ https://github.com/softScheck/tplink-smartplug/
 which are licensed under the Apache License, Version 2.0
 http://www.apache.org/licenses/LICENSE-2.0
 """
+
 import asyncio
 import contextlib
 import errno

pyproject.toml

@@ -101,6 +101,8 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.ruff]
 target-version = "py38"
+
+[tool.ruff.lint]
 select = [
   "E",  # pycodestyle
   "D",  # pydocstyle
@@ -116,10 +118,10 @@ ignore = [
   "D107",  # Missing docstring in `__init__`
 ]
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "pep257"
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "kasa/tests/*.py" = [
     "D100",
     "D101",