Update black and isort

Author: tulir

.github/workflows/python-package.yml

@@ -11,7 +11,7 @@ jobs:
         python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
       with:
@@ -46,7 +46,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       with:
         python-version: "3.14"
@@ -56,7 +56,7 @@ jobs:
     - uses: psf/black@stable
       with:
         src: "./mautrix"
-        version: "25.11.0"
+        version: "26.3.1"
     - name: pre-commit
       run: |
         pip install pre-commit

.pre-commit-config.yaml

@@ -8,13 +8,13 @@ repos:
       - id: check-yaml
       - id: check-added-large-files
   - repo: https://github.com/psf/black
-    rev: 25.11.0
+    rev: 26.3.1
     hooks:
       - id: black
         language_version: python3
         files: ^mautrix/.*\.pyi?$
   - repo: https://github.com/PyCQA/isort
-    rev: 7.0.0
+    rev: 8.0.1
     hooks:
       - id: isort
         files: ^mautrix/.*\.pyi?$

dev-requirements.txt

@@ -1,3 +1,3 @@
 pre-commit>=2.10.1,<3
-isort>=5.10.1,<6
-black>=24,<25
+isort>=8,<9
+black>=26,<27

mautrix/client/state_store/asyncpg/upgrade.py

@@ -16,33 +16,33 @@
 
 @upgrade_table.register(description="Latest revision", upgrades_to=4)
 async def upgrade_blank_to_v4(conn: Connection, scheme: Scheme) -> None:
-    await conn.execute(
-        """CREATE TABLE mx_room_state (
+    await conn.execute("""
+        CREATE TABLE mx_room_state (
             room_id              TEXT PRIMARY KEY,
             is_encrypted         BOOLEAN,
             has_full_member_list BOOLEAN,
             encryption           TEXT,
             power_levels         TEXT,
             create_event         TEXT
-        )"""
-    )
+        )
+    """)
     membership_check = ""
     if scheme != Scheme.SQLITE:
         await conn.execute(
             "CREATE TYPE membership AS ENUM ('join', 'leave', 'invite', 'ban', 'knock')"
         )
     else:
         membership_check = "CHECK (membership IN ('join', 'leave', 'invite', 'ban', 'knock'))"
-    await conn.execute(
-        f"""CREATE TABLE mx_user_profile (
+    await conn.execute(f"""
+        CREATE TABLE mx_user_profile (
             room_id     TEXT,
             user_id     TEXT,
             membership  membership NOT NULL {membership_check},
             displayname TEXT,
             avatar_url  TEXT,
             PRIMARY KEY (room_id, user_id)
-        )"""
-    )
+        )
+    """)
 
 
 @upgrade_table.register(description="Stop using size-limited string fields")
@@ -60,16 +60,14 @@ async def upgrade_v2(conn: Connection, scheme: Scheme) -> None:
 @upgrade_table.register(description="Mark rooms that need crypto state event resynced")
 async def upgrade_v3(conn: Connection) -> None:
     if await conn.table_exists("portal"):
-        await conn.execute(
-            """
+        await conn.execute("""
             INSERT INTO mx_room_state (room_id, encryption)
             SELECT portal.mxid, '{"resync":true}' FROM portal
                 WHERE portal.encrypted=true AND portal.mxid IS NOT NULL
             ON CONFLICT (room_id) DO UPDATE
                 SET encryption=excluded.encryption
                 WHERE mx_room_state.encryption IS NULL
-            """
-        )
+        """)
 
 
 @upgrade_table.register(description="Add create event to room state cache")