From 4e96ddc5e10ae46d0f26a34b230df7f1cff0f000 Mon Sep 17 00:00:00 2001 From: Mike A Date: Sat, 10 Feb 2024 22:15:41 +0100 Subject: [PATCH 1/2] Make `errors.py` top-level --- findmy/__init__.py | 3 +-- findmy/{util => }/errors.py | 0 findmy/reports/account.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) rename findmy/{util => }/errors.py (100%) diff --git a/findmy/__init__.py b/findmy/__init__.py index 4352594..f0fc461 100644 --- a/findmy/__init__.py +++ b/findmy/__init__.py @@ -1,8 +1,7 @@ """A package providing everything you need to work with Apple's FindMy network.""" -from . import keys, reports, scanner +from . import errors, keys, reports, scanner from .accessory import FindMyAccessory from .keys import KeyPair -from .util import errors __all__ = ( "keys", diff --git a/findmy/util/errors.py b/findmy/errors.py similarity index 100% rename from findmy/util/errors.py rename to findmy/errors.py diff --git a/findmy/reports/account.py b/findmy/reports/account.py index bdfeee7..45048a1 100644 --- a/findmy/reports/account.py +++ b/findmy/reports/account.py @@ -30,8 +30,8 @@ from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC from typing_extensions import override +from findmy.errors import InvalidCredentialsError, InvalidStateError, UnhandledProtocolError from findmy.util.closable import Closable -from findmy.util.errors import InvalidCredentialsError, InvalidStateError, UnhandledProtocolError from findmy.util.http import HttpSession, decode_plist from .reports import LocationReport, LocationReportsFetcher From 2fd5920febf873fb55ca21aa441b975ab3e351a1 Mon Sep 17 00:00:00 2001 From: Mike Almeloo Date: Sun, 11 Feb 2024 15:46:35 +0100 Subject: [PATCH 2/2] Fix pre-commit workflow --- .github/workflows/pre-commit.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 3e7d519..a0f29f6 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -1,4 +1,4 @@ -name: Deploy documentation +name: Pre-commit on: workflow_dispatch: @@ -17,6 +17,12 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.10' + + - name: Install dependencies + run: | + python -m pip install poetry + poetry config virtualenvs.in-project true + poetry install - uses: pre-commit/action@v3.0.1