Align linting config with Black

Author: g-nie

.flake8

@@ -0,0 +1,5 @@
+[flake8]
+max-line-length = 88
+exclude = .tox,.git,*/migrations/*,venv,dist,build,*.pyc,*.egg-info
+ignore = E203,E231,E266,E501,W503,B950,F405
+max-complexity = 11

.github/workflows/test.yml

@@ -8,6 +8,23 @@ on:
   workflow_call:  # Allow for the publish workflows to run the tests by calling this workflow
 
 jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v6
+        with:
+          python-version: 3.13
+          cache: 'pip'
+      - name: Install dependencies
+        run: |
+          python -m pip install .[test]
+      - name: Run linting
+        run: |
+          make format
   test:
     name: Python ${{ matrix.python}} ${{ matrix.toxenv }}
     runs-on: ubuntu-latest
@@ -18,13 +35,6 @@ jobs:
         experimental: [false]
         toxenv: ["py"]
         include:
-          # Linting
-          - python: "3.13"
-            toxenv: flake8
-            experimental: false
-          - python: "3.13"
-            toxenv: isort
-            experimental: false
             # Future Wagtail release from main branch (allowed to fail)
           - python: "3.13"
             toxenv: wagtailmain

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Compatibility with Django 5.2 and 6.0.
 - Compatibility with Wagtail 7.0, 7.3 LTS, and 7.4.
 - Switch `setup.py` to `pyproject.toml`.
+- Linting with `black`, `isort` and `flake8`.
 - Added back coverage reporting.
 
 ### Fixed

Makefile

@@ -1,11 +1,11 @@
-.PHONY: help all clean install flake8 isort lint test
+.PHONY: help all clean install format test
 .DEFAULT_GOAL := help
 
 help: ## See what commands are available.
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36mmake %-15s\033[0m # %s\n", $$1, $$2}'
 
 
-all: install clean test lint ## Install, test and lint the project.
+all: clean install format test ## Install, format and test the project.
 
 clean: ## Remove Python file artifacts.
 	find . -name '*.pyc' -exec rm -rf {} +
@@ -16,16 +16,13 @@ clean: ## Remove Python file artifacts.
 install: ## Install dependencies.
 	pip install -e .[test]
 
-flake8: ## Run flake8 on the project.
-	flake8 src/ tests/
-
-isort: ## Run isort on the project.
-	isort --check-only --diff src/ tests/
-
-lint: flake8 isort ## Lint the project.
+format: ## Format the code.
+	black .
+	isort .
+	flake8 .
 
 test: ## Test the project.
 	pytest --cov
 
-cov: ## Generate coverage report (manually open htmlcov/index.html in browser)
+cov:  ## Generate coverage report (manually open htmlcov/index.html in browser)
 	pytest --cov --cov-report html

pyproject.toml

@@ -36,9 +36,12 @@ dependencies = [
 
 [project.optional-dependencies]
 test = [
+    "black>=26,<27",
     "coverage[toml]>=7.13.5,<8.0",
     "factory-boy",
     "flake8",
+    "flake8-black",
+    "flake8-isort",
     "isort",
     "pytest-cov",
     "pytest-django",
@@ -61,9 +64,14 @@ where = ["src"]
 testpaths = ["tests"]
 
 [tool.isort]
-line_length = 100
-multi_line_output = 4
-known_third_party = ["bakery", "django", "factory", "pytest", "wagtail"]
+force_grid_wrap = 0
+include_trailing_comma = true
+line_length = 88
+multi_line_output = 3
+use_parentheses = true
+
+[tool.black]
+line-length = 88
 
 [tool.coverage.run]
 branch = true