Merge pull request #73 from malmeloo/fix/pre-commit

fix: Pre-commit hooks

.github/workflows/pre-commit.yml

@@ -20,7 +20,7 @@ jobs:
       run: |
         python -m pip install poetry
         poetry config virtualenvs.in-project true
-        poetry install --with dev
+        poetry install --with dev,test
     
     - uses: pre-commit/[email protected]
 

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.9
+    rev: v0.6.3
     hooks:
       - id: ruff
         args: ["--fix"]
       - id: ruff-format
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.350
+    rev: v1.1.378
     hooks:
       - id: pyright

examples/_login.py

@@ -1,3 +1,5 @@
+# ruff: noqa: ASYNC230
+
 import json
 from pathlib import Path
 

examples/real_airtag.py

@@ -1,6 +1,7 @@
 """
 Example showing how to fetch locations of an AirTag, or any other FindMy accessory.
 """
+
 from __future__ import annotations
 
 import logging

findmy/__init__.py

@@ -1,4 +1,5 @@
 """A package providing everything you need to work with Apple's FindMy network."""
+
 from . import errors, keys, reports, scanner
 from .accessory import FindMyAccessory
 from .keys import KeyPair

findmy/accessory.py

@@ -3,6 +3,7 @@
 
 Accessories could be anything ranging from AirTags to iPhones.
 """
+
 from __future__ import annotations
 
 import logging
@@ -64,7 +65,7 @@ def keys_between(self, start: int | datetime, end: int | datetime) -> set[KeyPai
 class FindMyAccessory(RollingKeyPairSource):
     """A findable Find My-accessory using official key rollover."""
 
-    def __init__(  # noqa: PLR0913
+    def __init__(
         self,
         master_key: bytes,
         skn: bytes,
@@ -235,12 +236,10 @@ def __next__(self) -> KeyPair:
         return self._get_keypair(self._iter_ind)
 
     @overload
-    def __getitem__(self, val: int) -> KeyPair:
-        ...
+    def __getitem__(self, val: int) -> KeyPair: ...
 
     @overload
-    def __getitem__(self, val: slice) -> Generator[KeyPair, None, None]:
-        ...
+    def __getitem__(self, val: slice) -> Generator[KeyPair, None, None]: ...
 
     @override
     def __getitem__(self, val: int | slice) -> KeyPair | Generator[KeyPair, None, None]:

findmy/keys.py

@@ -1,4 +1,5 @@
 """Module to work with private and public keys as used in FindMy accessories."""
+
 from __future__ import annotations
 
 import base64
@@ -156,13 +157,11 @@ def __next__(self) -> K:
 
     @overload
     @abstractmethod
-    def __getitem__(self, val: int) -> K:
-        ...
+    def __getitem__(self, val: int) -> K: ...
 
     @overload
     @abstractmethod
-    def __getitem__(self, val: slice) -> Generator[K, None, None]:
-        ...
+    def __getitem__(self, val: slice) -> Generator[K, None, None]: ...
 
     @abstractmethod
     def __getitem__(self, val: int | slice) -> K | Generator[K, None, None]:

findmy/reports/__init__.py

@@ -1,4 +1,5 @@
 """Code related to fetching location reports."""
+
 from .account import AppleAccount, AsyncAppleAccount
 from .anisette import BaseAnisetteProvider, RemoteAnisetteProvider
 from .state import LoginState

findmy/reports/account.py

@@ -228,8 +228,7 @@ def fetch_reports(
         keys: HasHashedPublicKey,
         date_from: datetime,
         date_to: datetime | None,
-    ) -> MaybeCoro[list[LocationReport]]:
-        ...
+    ) -> MaybeCoro[list[LocationReport]]: ...
 
     @overload
     @abstractmethod
@@ -238,8 +237,7 @@ def fetch_reports(
         keys: Sequence[HasHashedPublicKey],
         date_from: datetime,
         date_to: datetime | None,
-    ) -> MaybeCoro[dict[HasHashedPublicKey, list[LocationReport]]]:
-        ...
+    ) -> MaybeCoro[dict[HasHashedPublicKey, list[LocationReport]]]: ...
 
     @overload
     @abstractmethod
@@ -248,8 +246,7 @@ def fetch_reports(
         keys: RollingKeyPairSource,
         date_from: datetime,
         date_to: datetime | None,
-    ) -> MaybeCoro[list[LocationReport]]:
-        ...
+    ) -> MaybeCoro[list[LocationReport]]: ...
 
     @abstractmethod
     def fetch_reports(
@@ -271,26 +268,23 @@ def fetch_last_reports(
         self,
         keys: HasHashedPublicKey,
         hours: int = 7 * 24,
-    ) -> MaybeCoro[list[LocationReport]]:
-        ...
+    ) -> MaybeCoro[list[LocationReport]]: ...
 
     @overload
     @abstractmethod
     def fetch_last_reports(
         self,
         keys: Sequence[HasHashedPublicKey],
         hours: int = 7 * 24,
-    ) -> MaybeCoro[dict[HasHashedPublicKey, list[LocationReport]]]:
-        ...
+    ) -> MaybeCoro[dict[HasHashedPublicKey, list[LocationReport]]]: ...
 
     @overload
     @abstractmethod
     def fetch_last_reports(
         self,
         keys: RollingKeyPairSource,
         hours: int = 7 * 24,
-    ) -> MaybeCoro[list[LocationReport]]:
-        ...
+    ) -> MaybeCoro[list[LocationReport]]: ...
 
     @abstractmethod
     def fetch_last_reports(
@@ -629,26 +623,23 @@ async def fetch_reports(
         keys: HasHashedPublicKey,
         date_from: datetime,
         date_to: datetime | None,
-    ) -> list[LocationReport]:
-        ...
+    ) -> list[LocationReport]: ...
 
     @overload
     async def fetch_reports(
         self,
         keys: Sequence[HasHashedPublicKey],
         date_from: datetime,
         date_to: datetime | None,
-    ) -> dict[HasHashedPublicKey, list[LocationReport]]:
-        ...
+    ) -> dict[HasHashedPublicKey, list[LocationReport]]: ...
 
     @overload
     async def fetch_reports(
         self,
         keys: RollingKeyPairSource,
         date_from: datetime,
         date_to: datetime | None,
-    ) -> list[LocationReport]:
-        ...
+    ) -> list[LocationReport]: ...
 
     @require_login_state(LoginState.LOGGED_IN)
     @override
@@ -672,24 +663,21 @@ async def fetch_last_reports(
         self,
         keys: HasHashedPublicKey,
         hours: int = 7 * 24,
-    ) -> list[LocationReport]:
-        ...
+    ) -> list[LocationReport]: ...
 
     @overload
     async def fetch_last_reports(
         self,
         keys: Sequence[HasHashedPublicKey],
         hours: int = 7 * 24,
-    ) -> dict[HasHashedPublicKey, list[LocationReport]]:
-        ...
+    ) -> dict[HasHashedPublicKey, list[LocationReport]]: ...
 
     @overload
     async def fetch_last_reports(
         self,
         keys: RollingKeyPairSource,
         hours: int = 7 * 24,
-    ) -> list[LocationReport]:
-        ...
+    ) -> list[LocationReport]: ...
 
     @require_login_state(LoginState.LOGGED_IN)
     @override
@@ -1035,26 +1023,23 @@ def fetch_reports(
         keys: HasHashedPublicKey,
         date_from: datetime,
         date_to: datetime | None,
-    ) -> list[LocationReport]:
-        ...
+    ) -> list[LocationReport]: ...
 
     @overload
     def fetch_reports(
         self,
         keys: Sequence[HasHashedPublicKey],
         date_from: datetime,
         date_to: datetime | None,
-    ) -> dict[HasHashedPublicKey, list[LocationReport]]:
-        ...
+    ) -> dict[HasHashedPublicKey, list[LocationReport]]: ...
 
     @overload
     def fetch_reports(
         self,
         keys: RollingKeyPairSource,
         date_from: datetime,
         date_to: datetime | None,
-    ) -> list[LocationReport]:
-        ...
+    ) -> list[LocationReport]: ...
 
     @override
     def fetch_reports(
@@ -1072,24 +1057,21 @@ def fetch_last_reports(
         self,
         keys: HasHashedPublicKey,
         hours: int = 7 * 24,
-    ) -> list[LocationReport]:
-        ...
+    ) -> list[LocationReport]: ...
 
     @overload
     def fetch_last_reports(
         self,
         keys: Sequence[HasHashedPublicKey],
         hours: int = 7 * 24,
-    ) -> dict[HasHashedPublicKey, list[LocationReport]]:
-        ...
+    ) -> dict[HasHashedPublicKey, list[LocationReport]]: ...
 
     @overload
     def fetch_last_reports(
         self,
         keys: RollingKeyPairSource,
         hours: int = 7 * 24,
-    ) -> list[LocationReport]:
-        ...
+    ) -> list[LocationReport]: ...
 
     @override
     def fetch_last_reports(

findmy/reports/anisette.py

@@ -1,4 +1,5 @@
 """Module for Anisette header providers."""
+
 from __future__ import annotations
 
 import base64

findmy/reports/reports.py

@@ -232,26 +232,23 @@ async def fetch_reports(
         date_from: datetime,
         date_to: datetime,
         device: HasHashedPublicKey,
-    ) -> list[LocationReport]:
-        ...
+    ) -> list[LocationReport]: ...
 
     @overload
     async def fetch_reports(
         self,
         date_from: datetime,
         date_to: datetime,
         device: Sequence[HasHashedPublicKey],
-    ) -> dict[HasHashedPublicKey, list[LocationReport]]:
-        ...
+    ) -> dict[HasHashedPublicKey, list[LocationReport]]: ...
 
     @overload
     async def fetch_reports(
         self,
         date_from: datetime,
         date_to: datetime,
         device: RollingKeyPairSource,
-    ) -> list[LocationReport]:
-        ...
+    ) -> list[LocationReport]: ...
 
     async def fetch_reports(
         self,

findmy/reports/state.py

@@ -1,4 +1,5 @@
 """Account  login state."""
+
 from enum import Enum
 
 from typing_extensions import override

findmy/reports/twofactor.py

@@ -1,4 +1,5 @@
 """Public classes related to handling two-factor authentication."""
+
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Generic, TypeVar
 

findmy/scanner/__init__.py

@@ -1,4 +1,5 @@
 """Utilities related to physically discoverable FindMy-devices."""
+
 from .scanner import (
     NearbyOfflineFindingDevice,
     OfflineFindingScanner,

findmy/scanner/scanner.py

@@ -139,7 +139,7 @@ def payload_len(cls) -> int:
         """Length of OfflineFinding data payload in bytes."""
         return 0x02  # 2
 
-    def __init__(  # noqa: PLR0913
+    def __init__(
         self,
         mac_bytes: bytes,
         status_byte: int,

findmy/util/__init__.py

@@ -1,4 +1,5 @@
 """Utility functions and classes. Intended for internal use."""
+
 from .http import HttpResponse, HttpSession
 from .parsers import decode_plist
 

findmy/util/closable.py

@@ -1,4 +1,5 @@
 """ABC for async classes that need to be cleaned up before exiting."""
+
 from __future__ import annotations
 
 import asyncio