From 76ebf259417e61005ac24b21f8bc620d353c18dd Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 20:59:58 +0100
Subject: [PATCH 01/23] Add the sample start of a pre-commit config

---
 .pre-commit-config.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000..fd16ba2dc
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,10 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files

From 04ed6c5ece79dc4548f298119084242192215976 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 21:04:16 +0100
Subject: [PATCH 02/23] Add custom-linters to the pre-commit setup

---
 .pre-commit-config.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fd16ba2dc..848e8239a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,3 +8,10 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: check-added-large-files
+-   repo: local
+    hooks:
+    -   id: custom-linters
+        name: custom-linters
+        entry: pytest ci/custom_linters.py
+        language: system
+        pass_filenames: false

From 9cd483e6c820b19c5fbb13a43b3231cdf14653b1 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 21:18:07 +0100
Subject: [PATCH 03/23] Add pre-commit as a dependency

---
 .pre-commit-config.yaml      | 20 ++++++++++++++++++++
 LICENSE                      |  1 -
 docs/source/contributing.rst | 10 ++++++++--
 lint.mk                      | 16 ----------------
 pyproject.toml               |  1 +
 5 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 848e8239a..00af3a3f5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,3 +15,23 @@ repos:
         entry: pytest ci/custom_linters.py
         language: system
         pass_filenames: false
+    -   id: actionlint
+        name: actionlint
+        entry: actionlint
+        language: system
+        pass_filenames: false
+    -   id: mypy
+        name: mypy
+        entry: mypy .
+        language: system
+        pass_filenames: false
+    -   id: check-manifest
+        name: check-manifest
+        entry: check-manifest .
+        language: system
+        pass_filenames: false
+    -   id: pyright
+        name: pyright
+        entry: pyright .
+        language: system
+        pass_filenames: false
diff --git a/LICENSE b/LICENSE
index 69f733fdf..ef26969f8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -17,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
index cb227290f..6227a554a 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/contributing.rst
@@ -27,14 +27,20 @@ and on Ubuntu with ``apt``:
 
    apt-get install -y enchant
 
+Install pre-commit hooks:
+
+.. prompt:: bash
+
+   pre-commit install
+
 Linting
 -------
 
-Run lint tools:
+Run lint tools either by committing, or with:
 
 .. prompt:: bash
 
-   make lint
+   pre-commit run
 
 To fix some lint errors, run the following:
 
diff --git a/lint.mk b/lint.mk
index f7c96b63a..cc1079439 100644
--- a/lint.mk
+++ b/lint.mk
@@ -2,22 +2,6 @@
 
 SHELL := /bin/bash -euxo pipefail
 
-.PHONY: custom-linters
-custom-linters:
-	pytest ci/custom_linters.py
-
-.PHONY: actionlint
-actionlint:
-	actionlint
-
-.PHONY: mypy
-mypy:
-	mypy .
-
-.PHONY: check-manifest
-check-manifest:
-	check-manifest .
-
 .PHONY: doc8
 doc8:
 	doc8 .
diff --git a/pyproject.toml b/pyproject.toml
index 4b8666ceb..6e8b231aa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -327,6 +327,7 @@ dev = [
     "vws-python==2024.2.19",
     "VWS-Test-Fixtures==2023.3.5",
     "vws-web-tools==2023.12.26",
+    "pre-commit==3.7.1",
 ]
 [project.urls]
 Documentation = "https://vws-python-mock.readthedocs.io"

From f4dd0e9eae8656293c774e70b252ad3a7b52617a Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 21:18:31 +0100
Subject: [PATCH 04/23] Remove old Makefile command

---
 Makefile                     | 25 -------------------------
 docs/source/contributing.rst |  6 ------
 2 files changed, 31 deletions(-)

diff --git a/Makefile b/Makefile
index f047bf528..e7c51da19 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 SHELL := /bin/bash -euxo pipefail
 
-include lint.mk
-
 # Treat Sphinx warnings as errors
 SPHINXOPTS := -W
 
@@ -11,29 +9,6 @@ update-secrets:
 	tar cvf secrets.tar ci_secrets/
 	gpg --yes --batch --passphrase=${PASSPHRASE_FOR_VUFORIA_SECRETS} --symmetric --cipher-algo AES256 secrets.tar
 
-.PHONY: lint
-lint: \
-    actionlint \
-    check-manifest \
-    deptry \
-    doc8 \
-    linkcheck \
-    mypy \
-    pyproject-fmt \
-    pyright \
-    pyright-verifytypes \
-    pyroma \
-    ruff \
-    spelling \
-    vulture \
-    pylint \
-    custom-linters
-
-.PHONY: fix-lint
-fix-lint: \
-    fix-pyproject-fmt \
-    fix-ruff
-
 .PHONY: docs
 docs:
 	make -C docs clean html SPHINXOPTS=$(SPHINXOPTS)
diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
index 6227a554a..654043dfb 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/contributing.rst
@@ -42,12 +42,6 @@ Run lint tools either by committing, or with:
 
    pre-commit run
 
-To fix some lint errors, run the following:
-
-.. prompt:: bash
-
-   make fix-lint
-
 .. _Homebrew: https://brew.sh
 
 Running Tests

From 2f949b80706cc094829e37f018db37e8abee6b28 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 21:30:01 +0100
Subject: [PATCH 05/23] Move pyroma to pre-commit setup

---
 .pre-commit-config.yaml | 15 +++++++++++++++
 lint.mk                 | 16 ----------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 00af3a3f5..20f0b8063 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,3 +35,18 @@ repos:
         entry: pyright .
         language: system
         pass_filenames: false
+    -   id: pyright-verifytypes
+        name: pyright-verifytypes
+        entry: pyright --verifytypes mock_vws
+        language: system
+        pass_filenames: false
+    -   id: vulture
+        name: vulture
+        entry: vulture --min-confidence 100 --exclude .eggs .
+        language: system
+        pass_filenames: false
+    -   id: pyroma
+        name: pyroma
+        entry: pyroma --min 10 .
+        language: system
+        pass_filenames: false
diff --git a/lint.mk b/lint.mk
index cc1079439..9516631e0 100644
--- a/lint.mk
+++ b/lint.mk
@@ -24,22 +24,6 @@ deptry:
 pylint:
 	pylint *.py src/ tests/ docs/ ci/
 
-.PHONY: pyroma
-pyroma:
-	pyroma --min 10 .
-
-.PHONY: pyright
-pyright:
-	pyright .
-
-.PHONY: pyright-verifytypes
-pyright-verifytypes:
-	pyright --verifytypes mock_vws
-
-.PHONY: vulture
-vulture:
-	vulture --min-confidence 100 --exclude _vendor --exclude .eggs .
-
 .PHONY: linkcheck
 linkcheck:
 	$(MAKE) -C docs/ linkcheck SPHINXOPTS=$(SPHINXOPTS)

From f96e5eb1a1b0ff5eda738a151e721500a9e314e4 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 21:34:11 +0100
Subject: [PATCH 06/23] Format pyproject.toml

---
 .pre-commit-config.yaml                                  | 1 +
 pyproject.toml                                           | 2 +-
 src/mock_vws/resources/oops_error_occurred_response.html | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 20f0b8063..ac28d00bf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -50,3 +50,4 @@ repos:
         entry: pyroma --min 10 .
         language: system
         pass_filenames: false
+        files: pyproject.toml
diff --git a/pyproject.toml b/pyproject.toml
index 6e8b231aa..17c1b4c51 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -294,6 +294,7 @@ dev = [
     "freezegun==1.5.1",
     "furo==2024.5.6",
     "mypy==1.10.0",
+    "pre-commit==3.7.1",
     "pydocstyle==6.3",
     "pyenchant==3.2.2",
     "pylint==3.2.0",
@@ -327,7 +328,6 @@ dev = [
     "vws-python==2024.2.19",
     "VWS-Test-Fixtures==2023.3.5",
     "vws-web-tools==2023.12.26",
-    "pre-commit==3.7.1",
 ]
 [project.urls]
 Documentation = "https://vws-python-mock.readthedocs.io"
diff --git a/src/mock_vws/resources/oops_error_occurred_response.html b/src/mock_vws/resources/oops_error_occurred_response.html
index d844502ae..b5f4d39f5 100644
--- a/src/mock_vws/resources/oops_error_occurred_response.html
+++ b/src/mock_vws/resources/oops_error_occurred_response.html
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <title>Error</title>
-        
+
 <style  type="text/css">
             html, body, pre {
                 margin: 0;

From f9ba27d45ee6d7fa89c24334455749a8e2fc8875 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 21:38:07 +0100
Subject: [PATCH 07/23] Only run custom_linters on manual

---
 .pre-commit-config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ac28d00bf..362df2b14 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,6 +13,7 @@ repos:
     -   id: custom-linters
         name: custom-linters
         entry: pytest ci/custom_linters.py
+        stages: [manual]
         language: system
         pass_filenames: false
     -   id: actionlint

From 7c104bf92dca079ad23f4063fe610de313e27d60 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 21:40:58 +0100
Subject: [PATCH 08/23] Start of running slow linters on push not commit

---
 .pre-commit-config.yaml | 2 +-
 lint.mk                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 362df2b14..b985dc90b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
     -   id: custom-linters
         name: custom-linters
         entry: pytest ci/custom_linters.py
-        stages: [manual]
+        stages: [push]
         language: system
         pass_filenames: false
     -   id: actionlint
diff --git a/lint.mk b/lint.mk
index 9516631e0..2c2fbf28b 100644
--- a/lint.mk
+++ b/lint.mk
@@ -1,5 +1,7 @@
 # Make commands for linting
 
+
+
 SHELL := /bin/bash -euxo pipefail
 
 .PHONY: doc8

From 1d12772322f0e9a5c8d10302918634058426abe9 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 21:43:24 +0100
Subject: [PATCH 09/23] Try pre-push for custom linters

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b985dc90b..4fbf73fda 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
     -   id: custom-linters
         name: custom-linters
         entry: pytest ci/custom_linters.py
-        stages: [push]
+        stages: [pre-push]
         language: system
         pass_filenames: false
     -   id: actionlint

From c19952565b17f35260088fcd366d280d96d26250 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 21:48:10 +0100
Subject: [PATCH 10/23] Try new install option

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4fbf73fda..618b56c77 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
     -   id: custom-linters
         name: custom-linters
         entry: pytest ci/custom_linters.py
-        stages: [pre-push]
+        stages: [push, pre-push]
         language: system
         pass_filenames: false
     -   id: actionlint

From 8e04f4dc88664e77cb4970a9334dd77aa20a81a9 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 22:05:12 +0100
Subject: [PATCH 11/23] Make most pre-commit hooks only run on push

---
 .pre-commit-config.yaml      | 6 +++++-
 docs/source/contributing.rst | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 618b56c77..34a2a9efe 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
     -   id: custom-linters
         name: custom-linters
         entry: pytest ci/custom_linters.py
-        stages: [push, pre-push]
+        stages: [push]
         language: system
         pass_filenames: false
     -   id: actionlint
@@ -23,21 +23,25 @@ repos:
         pass_filenames: false
     -   id: mypy
         name: mypy
+        stages: [push]
         entry: mypy .
         language: system
         pass_filenames: false
     -   id: check-manifest
         name: check-manifest
+        stages: [push]
         entry: check-manifest .
         language: system
         pass_filenames: false
     -   id: pyright
         name: pyright
+        stages: [push]
         entry: pyright .
         language: system
         pass_filenames: false
     -   id: pyright-verifytypes
         name: pyright-verifytypes
+        stages: [push]
         entry: pyright --verifytypes mock_vws
         language: system
         pass_filenames: false
diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
index 654043dfb..b2ef78714 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/contributing.rst
@@ -32,6 +32,7 @@ Install pre-commit hooks:
 .. prompt:: bash
 
    pre-commit install
+   pre-commit install --hook-type pre-push
 
 Linting
 -------

From e505ccbdd857452becc758d21ff6005d4283d5ae Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 22:07:50 +0100
Subject: [PATCH 12/23] Use pre-commit in CI

---
 .github/workflows/lint.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 421080bcf..01a532e98 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -43,4 +43,6 @@ jobs:
 
       - name: "Lint"
         run: |
-          make lint
+          pre-commit run --all-files --hook-stage commit --verbose
+          pre-commit run --all-files --hook-stage push --verbose
+          pre-commit run --all-files --hook-stage manual --verbose

From e12f7a24963583ad5d19aeb00337a56c5ea2a2cf Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 22:12:53 +0100
Subject: [PATCH 13/23] Limit pre-commits to file types

---
 .pre-commit-config.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 34a2a9efe..321125783 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,11 +21,13 @@ repos:
         entry: actionlint
         language: system
         pass_filenames: false
+        types: [yaml]
     -   id: mypy
         name: mypy
         stages: [push]
         entry: mypy .
         language: system
+        types: [python, toml]
         pass_filenames: false
     -   id: check-manifest
         name: check-manifest
@@ -38,6 +40,7 @@ repos:
         stages: [push]
         entry: pyright .
         language: system
+        types: [python, toml]
         pass_filenames: false
     -   id: pyright-verifytypes
         name: pyright-verifytypes
@@ -45,14 +48,16 @@ repos:
         entry: pyright --verifytypes mock_vws
         language: system
         pass_filenames: false
+        types: [python]
     -   id: vulture
         name: vulture
         entry: vulture --min-confidence 100 --exclude .eggs .
         language: system
         pass_filenames: false
+        types: [python]
     -   id: pyroma
         name: pyroma
         entry: pyroma --min 10 .
         language: system
         pass_filenames: false
-        files: pyproject.toml
+        types: [toml]

From 993f452586b48ab2fa21e5e96ef7ba8ce7a5720b Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 22:19:48 +0100
Subject: [PATCH 14/23] Move some more linters to pre-commit

---
 .pre-commit-config.yaml      | 11 +++++++++++
 docs/source/contributing.rst |  4 +++-
 lint.mk                      |  8 --------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 321125783..9205f619d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -61,3 +61,14 @@ repos:
         language: system
         pass_filenames: false
         types: [toml]
+    -   id: deptry
+        name: deptry
+        entry: deptry src/
+        language: system
+        pass_filenames: false
+    -   id: pylint
+        name: pylint
+        entry: pylint *.py src/ tests/ docs/ ci/
+        language: system
+        stages: [manual]
+        pass_filenames: false
diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
index b2ef78714..427d0d626 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/contributing.rst
@@ -41,7 +41,9 @@ Run lint tools either by committing, or with:
 
 .. prompt:: bash
 
-   pre-commit run
+   pre-commit run --all-files --hook-stage commit --verbose
+   pre-commit run --all-files --hook-stage push --verbose
+   pre-commit run --all-files --hook-stage manual --verbose
 
 .. _Homebrew: https://brew.sh
 
diff --git a/lint.mk b/lint.mk
index 2c2fbf28b..52d1483fa 100644
--- a/lint.mk
+++ b/lint.mk
@@ -18,14 +18,6 @@ fix-ruff:
 	ruff check --fix .
 	ruff format .
 
-.PHONY: deptry
-deptry:
-	deptry src/
-
-.PHONY: pylint
-pylint:
-	pylint *.py src/ tests/ docs/ ci/
-
 .PHONY: linkcheck
 linkcheck:
 	$(MAKE) -C docs/ linkcheck SPHINXOPTS=$(SPHINXOPTS)

From 788ea450b054e0f869e9a9e2e043d9415e3b40ae Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 22:23:56 +0100
Subject: [PATCH 15/23] Move hadolint lint step to pre-commit

---
 .github/workflows/lint.yml            |  7 -------
 .pre-commit-config.yaml               | 10 ++++++++++
 src/mock_vws/_flask_server/Dockerfile |  1 +
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 01a532e98..4e127ad95 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -34,13 +34,6 @@ jobs:
           curl -LsSf https://astral.sh/uv/install.sh | sh
           uv pip install --system --upgrade --editable .[dev]
 
-      # We choose not to use a Python wrapper or alternative to hadolint as none
-      # appear to be well maintained, and they require more setup than we would
-      # want.
-      - uses: hadolint/hadolint-action@v3.1.0
-        with:
-          dockerfile: src/mock_vws/_flask_server/Dockerfile
-
       - name: "Lint"
         run: |
           pre-commit run --all-files --hook-stage commit --verbose
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9205f619d..1c5a9a6d0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -72,3 +72,13 @@ repos:
         language: system
         stages: [manual]
         pass_filenames: false
+    -   id: hadolint-docker
+        name: Lint Dockerfiles
+        description: Runs hadolint Docker image to lint Dockerfiles
+        language: docker_image
+        types: [dockerfile]
+        stages: [manual] # Requires Docker to be running
+        # We choose not to use a Python wrapper or alternative to hadolint as none
+        # appear to be well maintained, and they require more setup than we would
+        # want.
+        entry: ghcr.io/hadolint/hadolint hadolint
diff --git a/src/mock_vws/_flask_server/Dockerfile b/src/mock_vws/_flask_server/Dockerfile
index 58125da6a..ce69427a1 100644
--- a/src/mock_vws/_flask_server/Dockerfile
+++ b/src/mock_vws/_flask_server/Dockerfile
@@ -1,4 +1,5 @@
 FROM python:3.12-slim as base
+
 # We set this pretend version as we do not have Git in our path, and we do
 # not care enough about having the version correct inside the Docker container
 # to install it.

From 5152699c1241c711b87cecada52a9bcc4786466c Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 22:37:10 +0100
Subject: [PATCH 16/23] Progress towards ruff pre-commit

---
 .pre-commit-config.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1c5a9a6d0..6d13725e7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -82,3 +82,8 @@ repos:
         # appear to be well maintained, and they require more setup than we would
         # want.
         entry: ghcr.io/hadolint/hadolint hadolint
+    -   id: ruff-check
+        name: Ruff check
+        entry: ruff check
+        language: system
+        types: [python]

From 6b7d2942f6cc4eb40d7dc0ea8d1b4044ded357c5 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 22:58:37 +0100
Subject: [PATCH 17/23] Move ruff and doc8 to pre-commit

---
 .pre-commit-config.yaml | 20 ++++++++++++++++++++
 lint.mk                 | 16 ----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6d13725e7..10115e5d1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -87,3 +87,23 @@ repos:
         entry: ruff check
         language: system
         types: [python]
+    -   id: ruff-format-check
+        name: Ruff format check
+        entry: ruff format --check
+        language: system
+        types: [python]
+    -   id: ruff-check-fix
+        name: Ruff check fix
+        entry: ruff check --fix
+        language: system
+        types: [python]
+    -   id: ruff-format-fix
+        name: Ruff format
+        entry: ruff format
+        language: system
+        types: [python]
+    -   id: doc8
+        name: doc8
+        entry: doc8
+        language: system
+        types: [rst]
diff --git a/lint.mk b/lint.mk
index 52d1483fa..4a575131e 100644
--- a/lint.mk
+++ b/lint.mk
@@ -1,23 +1,7 @@
 # Make commands for linting
 
-
-
 SHELL := /bin/bash -euxo pipefail
 
-.PHONY: doc8
-doc8:
-	doc8 .
-
-.PHONY: ruff
-ruff:
-	ruff check .
-	ruff format --check .
-
-.PHONY: fix-ruff
-fix-ruff:
-	ruff check --fix .
-	ruff format .
-
 .PHONY: linkcheck
 linkcheck:
 	$(MAKE) -C docs/ linkcheck SPHINXOPTS=$(SPHINXOPTS)

From 7a506c4e30791fb6cc2605e568dc2c08b6d39fab Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 23:02:27 +0100
Subject: [PATCH 18/23] Move pyproject-fmt to pre-commit

---
 .pre-commit-config.yaml               | 12 ++++++++++++
 lint.mk                               |  8 --------
 src/mock_vws/_flask_server/Dockerfile |  1 -
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 10115e5d1..0b40e9895 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -107,3 +107,15 @@ repos:
         entry: doc8
         language: system
         types: [rst]
+    -   id: pyproject-fmt-check
+        name: pyproject-fmt check
+        entry: pyproject-fmt --check
+        language: system
+        types: [toml]
+        files: pyproject.toml
+    -   id: pyproject-fmt-fix
+        name: pyproject-fmt
+        entry: pyproject-fmt
+        language: system
+        types: [toml]
+        files: pyproject.toml
diff --git a/lint.mk b/lint.mk
index 4a575131e..63a1c14f2 100644
--- a/lint.mk
+++ b/lint.mk
@@ -6,14 +6,6 @@ SHELL := /bin/bash -euxo pipefail
 linkcheck:
 	$(MAKE) -C docs/ linkcheck SPHINXOPTS=$(SPHINXOPTS)
 
-.PHONY: pyproject-fmt
-pyproject-fmt:
-	pyproject-fmt --check pyproject.toml
-
-.PHONY: fix-pyproject-fmt
-fix-pyproject-fmt:
-	pyproject-fmt pyproject.toml
-
 .PHONY: spelling
 spelling:
 	$(MAKE) -C docs/ spelling SPHINXOPTS=$(SPHINXOPTS)
diff --git a/src/mock_vws/_flask_server/Dockerfile b/src/mock_vws/_flask_server/Dockerfile
index ce69427a1..58125da6a 100644
--- a/src/mock_vws/_flask_server/Dockerfile
+++ b/src/mock_vws/_flask_server/Dockerfile
@@ -1,5 +1,4 @@
 FROM python:3.12-slim as base
-
 # We set this pretend version as we do not have Git in our path, and we do
 # not care enough about having the version correct inside the Docker container
 # to install it.

From a3e1ab51809ad08c0d53e5dfa0f1a085bbcca16e Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 23:32:11 +0100
Subject: [PATCH 19/23] Add docs to pre-commit

---
 .pre-commit-config.yaml | 21 +++++++++++++++++++++
 lint.mk                 | 11 -----------
 2 files changed, 21 insertions(+), 11 deletions(-)
 delete mode 100644 lint.mk

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0b40e9895..056b72468 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,6 +15,7 @@ repos:
         entry: pytest ci/custom_linters.py
         stages: [push]
         language: system
+        types: [yaml, python]
         pass_filenames: false
     -   id: actionlint
         name: actionlint
@@ -119,3 +120,23 @@ repos:
         language: system
         types: [toml]
         files: pyproject.toml
+    -   id: linkcheck
+        name: linkcheck
+        entry: make -C docs/ linkcheck SPHINXOPTS=-W
+        language: system
+        types: [rst]
+        stages: [manual]
+        pass_filenames: false
+    -   id: spelling
+        name: spelling
+        entry: make -C docs/ spelling SPHINXOPTS=-W
+        language: system
+        types: [rst]
+        stages: [manual]
+        pass_filenames: false
+    -   id: docs
+        name: Build Documentation
+        entry: make docs
+        language: system
+        stages: [manual]
+        pass_filenames: false
diff --git a/lint.mk b/lint.mk
deleted file mode 100644
index 63a1c14f2..000000000
--- a/lint.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Make commands for linting
-
-SHELL := /bin/bash -euxo pipefail
-
-.PHONY: linkcheck
-linkcheck:
-	$(MAKE) -C docs/ linkcheck SPHINXOPTS=$(SPHINXOPTS)
-
-.PHONY: spelling
-spelling:
-	$(MAKE) -C docs/ spelling SPHINXOPTS=$(SPHINXOPTS)

From c83ebccf8924233d217ce561e8440ecf914370f7 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 23:36:08 +0100
Subject: [PATCH 20/23] Fix vulture error

---
 .pre-commit-config.yaml | 10 ++++++++--
 src/mock_vws/target.py  |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 056b72468..1616b0396 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,12 +17,14 @@ repos:
         language: system
         types: [yaml, python]
         pass_filenames: false
+
     -   id: actionlint
         name: actionlint
         entry: actionlint
         language: system
         pass_filenames: false
         types: [yaml]
+
     -   id: mypy
         name: mypy
         stages: [push]
@@ -30,12 +32,14 @@ repos:
         language: system
         types: [python, toml]
         pass_filenames: false
+
     -   id: check-manifest
         name: check-manifest
         stages: [push]
         entry: check-manifest .
         language: system
         pass_filenames: false
+
     -   id: pyright
         name: pyright
         stages: [push]
@@ -43,6 +47,7 @@ repos:
         language: system
         types: [python, toml]
         pass_filenames: false
+
     -   id: pyright-verifytypes
         name: pyright-verifytypes
         stages: [push]
@@ -50,12 +55,13 @@ repos:
         language: system
         pass_filenames: false
         types: [python]
+
     -   id: vulture
         name: vulture
-        entry: vulture --min-confidence 100 --exclude .eggs .
+        entry: vulture --min-confidence 100 --exclude .eggs
         language: system
-        pass_filenames: false
         types: [python]
+
     -   id: pyroma
         name: pyroma
         entry: pyroma --min 10 .
diff --git a/src/mock_vws/target.py b/src/mock_vws/target.py
index 1ffb0cd43..00541db14 100644
--- a/src/mock_vws/target.py
+++ b/src/mock_vws/target.py
@@ -183,7 +183,7 @@ def from_dict(cls, target_dict: TargetDict) -> Target:
         target_tracking_rater = HardcodedTargetTrackingRater(
             rating=target_dict["tracking_rating"],
         )
-        return Target(
+        return cls(
             target_id=target_id,
             name=name,
             active_flag=active_flag,

From b7f11d971062ec9d57c573482138e8662270ef93 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 23:37:02 +0100
Subject: [PATCH 21/23] Use Self type

---
 .pre-commit-config.yaml      | 13 +++++++++++++
 docs/source/contributing.rst |  2 +-
 src/mock_vws/database.py     |  4 ++--
 src/mock_vws/target.py       |  4 ++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1616b0396..bf04c42e1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -68,17 +68,20 @@ repos:
         language: system
         pass_filenames: false
         types: [toml]
+
     -   id: deptry
         name: deptry
         entry: deptry src/
         language: system
         pass_filenames: false
+
     -   id: pylint
         name: pylint
         entry: pylint *.py src/ tests/ docs/ ci/
         language: system
         stages: [manual]
         pass_filenames: false
+
     -   id: hadolint-docker
         name: Lint Dockerfiles
         description: Runs hadolint Docker image to lint Dockerfiles
@@ -89,43 +92,51 @@ repos:
         # appear to be well maintained, and they require more setup than we would
         # want.
         entry: ghcr.io/hadolint/hadolint hadolint
+
     -   id: ruff-check
         name: Ruff check
         entry: ruff check
         language: system
         types: [python]
+
     -   id: ruff-format-check
         name: Ruff format check
         entry: ruff format --check
         language: system
         types: [python]
+
     -   id: ruff-check-fix
         name: Ruff check fix
         entry: ruff check --fix
         language: system
         types: [python]
+
     -   id: ruff-format-fix
         name: Ruff format
         entry: ruff format
         language: system
         types: [python]
+
     -   id: doc8
         name: doc8
         entry: doc8
         language: system
         types: [rst]
+
     -   id: pyproject-fmt-check
         name: pyproject-fmt check
         entry: pyproject-fmt --check
         language: system
         types: [toml]
         files: pyproject.toml
+
     -   id: pyproject-fmt-fix
         name: pyproject-fmt
         entry: pyproject-fmt
         language: system
         types: [toml]
         files: pyproject.toml
+
     -   id: linkcheck
         name: linkcheck
         entry: make -C docs/ linkcheck SPHINXOPTS=-W
@@ -133,6 +144,7 @@ repos:
         types: [rst]
         stages: [manual]
         pass_filenames: false
+
     -   id: spelling
         name: spelling
         entry: make -C docs/ spelling SPHINXOPTS=-W
@@ -140,6 +152,7 @@ repos:
         types: [rst]
         stages: [manual]
         pass_filenames: false
+
     -   id: docs
         name: Build Documentation
         entry: make docs
diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
index 427d0d626..4ac46f0a6 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/contributing.rst
@@ -27,7 +27,7 @@ and on Ubuntu with ``apt``:
 
    apt-get install -y enchant
 
-Install pre-commit hooks:
+Install ``pre-commit`` hooks:
 
 .. prompt:: bash
 
diff --git a/src/mock_vws/database.py b/src/mock_vws/database.py
index 39fc3c774..865519700 100644
--- a/src/mock_vws/database.py
+++ b/src/mock_vws/database.py
@@ -6,7 +6,7 @@
 
 import uuid
 from dataclasses import dataclass, field
-from typing import TypedDict
+from typing import Self, TypedDict
 
 from mock_vws._constants import TargetStatuses
 from mock_vws.states import States
@@ -99,7 +99,7 @@ def get_target(self, target_id: str) -> Target:
         return target
 
     @classmethod
-    def from_dict(cls, database_dict: DatabaseDict) -> VuforiaDatabase:
+    def from_dict(cls, database_dict: DatabaseDict) -> Self:
         """
         Load a database from a dictionary.
         """
diff --git a/src/mock_vws/target.py b/src/mock_vws/target.py
index 00541db14..bdc47eac7 100644
--- a/src/mock_vws/target.py
+++ b/src/mock_vws/target.py
@@ -10,7 +10,7 @@
 import statistics
 import uuid
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, TypedDict
+from typing import TYPE_CHECKING, Self, TypedDict
 from zoneinfo import ZoneInfo
 
 from PIL import Image, ImageStat
@@ -153,7 +153,7 @@ def tracking_rating(self) -> int:
         return self._post_processing_target_rating
 
     @classmethod
-    def from_dict(cls, target_dict: TargetDict) -> Target:
+    def from_dict(cls, target_dict: TargetDict) -> Self:
         """
         Load a target from a dictionary.
         """

From b78884850df7c016235190b781d29500496e68a2 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Thu, 16 May 2024 00:36:36 +0100
Subject: [PATCH 22/23] Do not fix whitespace on resource files

---
 .pre-commit-config.yaml                                  | 2 ++
 src/mock_vws/resources/oops_error_occurred_response.html | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bf04c42e1..514379cd2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,6 +5,8 @@ repos:
     rev: v3.2.0
     hooks:
     -   id: trailing-whitespace
+        exclude: ^src/mock_vws/resources/
+
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: check-added-large-files
diff --git a/src/mock_vws/resources/oops_error_occurred_response.html b/src/mock_vws/resources/oops_error_occurred_response.html
index b5f4d39f5..d844502ae 100644
--- a/src/mock_vws/resources/oops_error_occurred_response.html
+++ b/src/mock_vws/resources/oops_error_occurred_response.html
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <title>Error</title>
-
+        
 <style  type="text/css">
             html, body, pre {
                 margin: 0;

From 5bb6238c96cf3a7a50d4d8712c4884629c6b360b Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Thu, 16 May 2024 00:47:59 +0100
Subject: [PATCH 23/23] Commit changes from lint stage

---
 .github/workflows/lint.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4e127ad95..f09270f0d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -39,3 +39,6 @@ jobs:
           pre-commit run --all-files --hook-stage commit --verbose
           pre-commit run --all-files --hook-stage push --verbose
           pre-commit run --all-files --hook-stage manual --verbose
+
+      - uses: pre-commit-ci/lite-action@v1.0.2
+        if: always()