Merge pull request #114 from malmeloo/migrate-uv

chore: Migrate from poetry to uv

Author: malmeloo

.github/actions/setup-project/action.yml

@@ -1,48 +1,25 @@
-name: Common Python + Poetry Setup
+name: Common Python + UV Setup
 
 inputs:
-  dependency-groups:
-    description: 'A comma-separated list of dependency groups to install'
-    default: 'main'
   python-version:
-    description: 'The Python version to use'
-    default: '3.10'
+    description: 'The Python version to install'
+    required: false
 
 runs:
   using: 'composite'
 
   steps:
-    - name: Set up Python
-      uses: actions/setup-python@v5
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
       with:
-        python-version: ${{ inputs.python-version }}
-
-    - name: Install poetry
-      shell: bash
-      run: |
-        python -m pip install poetry
-        poetry config virtualenvs.in-project true
-
-    - name: Get cache key
-      id: cache-key
-      shell: bash
-      run: |
-        key=$(echo "${{ inputs.dependency-groups }}" | sed 's/,/+/')
-        echo "key=$key" >> "$GITHUB_OUTPUT"
+        enable-cache: true
+        python-version: ${{ matrix.python-version }}
 
-    - name: Get full Python version
-      id: full-python-version
+    - name: Set up Python
+      if: ${{ inputs.python-version != '' }}
       shell: bash
-      run: echo version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))") >> $GITHUB_OUTPUT
-
-    - name: Load cached venv
-      id: cache-dependencies
-      uses: actions/cache@v4
-      with:
-        path: .venv
-        key: venv-${{ runner.os }}-py${{ steps.full-python-version.outputs.version }}-grp${{ steps.cache-key.outputs.key }}-${{ hashFiles('**/poetry.lock') }}
+      run: uv python install
 
     - name: Install dependencies
-      if: steps.cache-dependencies.outputs.cache-hit != 'true'
       shell: bash
-      run: poetry install --with ${{ inputs.dependency-groups }}
+      run: uv sync --all-extras --all-groups

.github/workflows/docs.yml

@@ -17,14 +17,15 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: './.github/actions/setup-project'
+    - name: Install uv and set the python version
+      uses: astral-sh/setup-uv@v5
       with:
-        dependency-groups: 'docs'
+        python-version: ${{ matrix.python-version }}
 
     - name: Build documentation
       run: |
         cd docs
-        poetry run make html
+        uv run make html
     
     - name: Setup Pages
       uses: actions/configure-pages@v5

.github/workflows/pre-commit.yml

@@ -14,8 +14,6 @@ jobs:
     - uses: actions/checkout@v4
 
     - uses: './.github/actions/setup-project'
-      with:
-        dependency-groups: 'dev,test'
 
     - uses: pre-commit/action@v3.0.1
 

.github/workflows/publish.yml

@@ -17,19 +17,16 @@ jobs:
     - uses: actions/checkout@v4
 
     - uses: './.github/actions/setup-project'
-      with:
-        dependency-groups: 'dev'
 
     - name: Prepare README
       run: ./scripts/refactor_readme.py README.md
 
     - name: Build package
-      run: poetry build
+      run: uv build
 
     - name: Publish package
       run: |
-        poetry config pypi-token.pypi ${{ secrets.PYPI_API_TOKEN }}
-        poetry publish
+        uv publish --token ${{ secrets.PYPI_API_TOKEN }}
 
     - name: Create release
       uses: softprops/action-gh-release@v2

.github/workflows/test.yml

@@ -17,14 +17,12 @@ jobs:
     - uses: actions/checkout@v4
 
     - uses: './.github/actions/setup-project'
-      with:
-        dependency-groups: 'dev'
 
     - id: supported-versions
       name: Get supported versions
       run: |
         set -e
-        echo "py-versions=$(poetry run ./scripts/supported_py_versions.py)" >> "$GITHUB_OUTPUT"
+        echo "py-versions=$(uv run ./scripts/supported_py_versions.py)" >> "$GITHUB_OUTPUT"
 
   test:
     runs-on: ubuntu-latest
@@ -40,10 +38,9 @@ jobs:
       - uses: './.github/actions/setup-project'
         with:
           python-version: ${{ matrix.py-version }}
-          dependency-groups: 'test'
 
       - name: Run unit tests
-        run: poetry run pytest
+        run: uv run pytest
 
   results:
     runs-on: ubuntu-latest

README.md

@@ -66,8 +66,8 @@ Before opening a pull request, please ensure that your code adheres to these rul
 There are pre-commit hooks included to help you with this, which you can set up as follows:
 
 ```shell
-pip install poetry
-poetry install --with dev  # this installs pre-commit into your environment
+pip install uv
+uv sync  # this installs ruff & pre-commit into your environment
 pre-commit install
 ```
 

findmy/__init__.py

@@ -5,10 +5,10 @@
 from .keys import KeyPair
 
 __all__ = (
+    "FindMyAccessory",
+    "KeyPair",
+    "errors",
     "keys",
     "reports",
     "scanner",
-    "errors",
-    "FindMyAccessory",
-    "KeyPair",
 )

findmy/accessory.py

@@ -10,13 +10,16 @@
 import plistlib
 from abc import ABC, abstractmethod
 from datetime import datetime, timedelta, timezone
-from typing import IO, Generator, overload
+from typing import IO, TYPE_CHECKING, overload
 
 from typing_extensions import override
 
 from .keys import KeyGenerator, KeyPair, KeyType
 from .util import crypto
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
 logging.getLogger(__name__)
 
 

findmy/keys.py

@@ -7,13 +7,16 @@
 import secrets
 from abc import ABC, abstractmethod
 from enum import Enum
-from typing import Generator, Generic, TypeVar, overload
+from typing import TYPE_CHECKING, Generic, TypeVar, overload
 
 from cryptography.hazmat.primitives.asymmetric import ec
 from typing_extensions import override
 
 from .util import crypto, parsers
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
 
 class KeyType(Enum):
     """Enum of possible key types."""

findmy/reports/__init__.py

@@ -8,8 +8,8 @@
 __all__ = (
     "AppleAccount",
     "AsyncAppleAccount",
-    "LoginState",
     "BaseAnisetteProvider",
+    "LoginState",
     "RemoteAnisetteProvider",
     "SmsSecondFactorMethod",
     "TrustedDeviceSecondFactorMethod",