Merge origin/main: the tree-wide ruff pass beside the Music reconnect work

1 files changed, 4 insertions, 9 deletions

diff --git a/packages/meshbay-hub/tests/test_mail_is_not_a_relay.py b/packages/meshbay-hub/tests/test_mail_is_not_a_relay.py
index fe6a5ee..a3f9a21 100644
--- a/packages/meshbay-hub/tests/test_mail_is_not_a_relay.py
+++ b/packages/meshbay-hub/tests/test_mail_is_not_a_relay.py
@@ -28,7 +28,6 @@ import base64
 import pytest
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
 from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey
-
 from meshbay_common.crypto import pk_to_b64
 from meshbay_hub import mail as mail_mod
 from meshbay_hub.api import users as users_mod
@@ -316,9 +315,8 @@ async def _signed_in(client, db_session, username: str, email: str) -> dict:
     genuinely `pending` here, exactly as it would be in production, and a
     pending account cannot log in.
     """
-    from sqlalchemy import select, update
-
     from meshbay_hub.db.models import User
+    from sqlalchemy import select, update
 
     r = await _register(client, username, email)
     assert r.status_code == 201, r.text
@@ -406,9 +404,8 @@ async def test_the_delay_survives_the_verification_row_being_deleted(
                            json={"email": "c-first@example.test"})
     assert r.status_code == 200, r.text
 
-    from sqlalchemy import delete
-
     from meshbay_hub.db.models import EmailVerification
+    from sqlalchemy import delete
     await db_session.execute(delete(EmailVerification))
     await db_session.commit()
 
@@ -421,9 +418,8 @@ async def test_the_delay_survives_the_verification_row_being_deleted(
 # ── The operator's controls ──────────────────────────────────────────────────
 
 async def _admin(client, db_session, username: str) -> dict:
-    from sqlalchemy import update
-
     from meshbay_hub.db.models import User
+    from sqlalchemy import update
 
     headers = await _signed_in(client, db_session, username,
                                f"{username}@example.test")
@@ -491,9 +487,8 @@ async def test_an_unknown_mail_setting_is_refused(client, db_session):
 @pytest.mark.asyncio
 async def test_a_moderator_may_read_the_bounds_but_not_change_them(
         client, db_session):
-    from sqlalchemy import update
-
     from meshbay_hub.db.models import User
+    from sqlalchemy import update
 
     headers = await _signed_in(client, db_session, "mailmod_test",
                                "mailmod@example.test")