Merge branch 'master' into patch-1

.github/workflows/lint.yaml

@@ -0,0 +1,20 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  ruff:
+    name: Ruff
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.10"
+    - name: Install Ruff
+      run: |
+        python -m pip install ruff>=0.5
+    - name: Format check (Ruff)
+      run: |
+        ruff format --check

.gitignore

@@ -30,6 +30,7 @@ pip-log.txt
 .coverage
 .tox
 .pytest_cache/
+.ruff_cache/
 nosetests.xml
 
 # Translations

.pre-commit-config.yaml

@@ -1,9 +1,8 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 24.8.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.5.7
     hooks:
-      - id: black
-        exclude: ^(oauth2_provider/migrations/|tests/migrations/)
+      - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
     hooks:

pyproject.toml

@@ -1,17 +1,10 @@
-[tool.black]
-line-length = 110
-target-version = ['py38']
-exclude = '''
-^/(
-        oauth2_provider/migrations/
-    |   tests/migrations/
-    |   .tox
-)
-'''
-
 # Ref: https://github.com/codespell-project/codespell#using-a-config-file
 [tool.codespell]
 skip = '.git,package-lock.json,locale,AUTHORS,tox.ini'
 check-hidden = true
 ignore-regex = '.*pragma: codespell-ignore.*'
 ignore-words-list = 'assertIn'
+
+[tool.ruff]
+line-length = 110
+exclude = [".tox", "oauth2_provider/migrations/", "tests/migrations/", "manage.py"]

tox.ini

@@ -100,7 +100,6 @@ deps =
     flake8
     flake8-isort
     flake8-quotes
-    flake8-black
 
 [testenv:migrations]
 setenv =