From 3f2887d67f61920198f4476ae7300db80d0231f8 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 7 Mar 2024 16:25:12 +0200
Subject: [PATCH] Update CI and pre-commit

---
 .github/workflows/python-lint.yml          | 7 ++++---
 .pre-commit-config.yaml                    | 6 +++---
 dev-requirements.txt                       | 2 +-
 maubot/management/api/instance_database.py | 8 +++++---
 pyproject.toml                             | 2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/python-lint.yml b/.github/workflows/python-lint.yml
index d88b8a8..b2fe29f 100644
--- a/.github/workflows/python-lint.yml
+++ b/.github/workflows/python-lint.yml
@@ -6,16 +6,17 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: "3.11"
+        python-version: "3.12"
     - uses: isort/isort-action@master
       with:
         sortPaths: "./maubot"
     - uses: psf/black@stable
       with:
         src: "./maubot"
+        version: "24.2.0"
     - name: pre-commit
       run: |
         pip install pre-commit
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0de079e..e3c5bb8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         exclude_types: [markdown]
@@ -8,13 +8,13 @@ repos:
       - id: check-yaml
       - id: check-added-large-files
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 24.2.0
     hooks:
       - id: black
         language_version: python3
         files: ^maubot/.*\.pyi?$
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         files: ^maubot/.*\.pyi?$
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 5cd14c2..bb8c2a0 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,3 +1,3 @@
 pre-commit>=2.10.1,<3
 isort>=5.10.1,<6
-black>=23,<24
+black>=24,<25
diff --git a/maubot/management/api/instance_database.py b/maubot/management/api/instance_database.py
index 97b2edf..a40434f 100644
--- a/maubot/management/api/instance_database.py
+++ b/maubot/management/api/instance_database.py
@@ -56,9 +56,11 @@ async def get_table(request: web.Request) -> web.Response:
     try:
         order = [tuple(order.split(":")) for order in request.query.getall("order")]
         order = [
-            (asc if sort.lower() == "asc" else desc)(table.columns[column])
-            if sort
-            else table.columns[column]
+            (
+                (asc if sort.lower() == "asc" else desc)(table.columns[column])
+                if sort
+                else table.columns[column]
+            )
             for column, sort in order
         ]
     except KeyError:
diff --git a/pyproject.toml b/pyproject.toml
index 4cee457..6c2ca27 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,5 +9,5 @@ skip = ["maubot/management/frontend"]
 
 [tool.black]
 line-length = 99
-target-version = ["py38"]
+target-version = ["py310"]
 force-exclude = "maubot/management/frontend"