Merge branch 'main' into feature/python-3-14

Author: gchqdev227

.github/workflows/documentation.yaml

@@ -5,8 +5,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.12

.github/workflows/pre-commit.yaml

@@ -5,8 +5,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.12
@@ -19,4 +17,4 @@ jobs:
           python -m pip install pre-commit
       - name: Run pre-commit checks
         run: |
-          python -m pre_commit run --all-files
+          python -m pre_commit run --all-files --color always

.github/workflows/unit-tests.yaml

@@ -17,7 +17,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Pull docker image
         run: |
-          docker pull concourse/mock-resource:latest
+          docker pull concourse/mock-resource:0.13.0
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: check-added-large-files
         args: [--enforce-all, --maxkb=100]
   - repo: https://github.com/google/yamlfmt
-    rev: v0.16.0
+    rev: v0.17.0
     hooks:
       - id: yamlfmt
   - repo: https://github.com/hhatto/autopep8
@@ -55,10 +55,14 @@ repos:
       - id: pyroma
         args: ["-d", "--min=10", "."]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.16.0
     hooks:
       - id: mypy
         additional_dependencies: ["types-docutils", "types-python-dateutil", "types-requests"]
+  - repo: "https://github.com/python-jsonschema/check-jsonschema"
+    rev: "0.33.0"
+    hooks:
+      - id: check-github-workflows
   - repo: https://github.com/johannsdg/pre-commit-license-headers
     rev: d53087d331942f263cb553dc67b0e51ffa3a3481
     hooks:

docs/source/extensions/concourse.py

@@ -44,7 +44,7 @@ def make_concourse_link(name: str, rawtext: str, text: str, lineno: int, inliner
 
     :return: A list containing the created node, and a list containing any messages generated during the function.
     """
-    text = nodes.unescape(text)  # type: ignore[attr-defined]
+    text = nodes.unescape(text)
     _, title, target = split_explicit_title(text)
 
     title = title.split(".")[-1].replace("-", " ")

docs/source/extensions/linecount.py

@@ -38,7 +38,7 @@ def count_lines(name: str, rawtext: str, text: str, lineno: int, inliner: Inline
 
     :return: A list containing the created node, and a list containing any messages generated during the function.
     """
-    path = Path(nodes.unescape(text))  # type: ignore[attr-defined]
+    path = Path(nodes.unescape(text))
     page_path = Path(Path(inliner.document.settings._source))
     resolved_path = (page_path.parent / path).resolve()
     with open(resolved_path) as rf:

docs/source/extensions/wikipedia.py

@@ -44,7 +44,7 @@ def make_wikipedia_link(name: str, rawtext: str, text: str, lineno: int, inliner
 
     :return: A list containing the created node, and a list containing any messages generated during the function.
     """
-    text = nodes.unescape(text)  # type: ignore[attr-defined]
+    text = nodes.unescape(text)
     has_explicit, title, target = split_explicit_title(text)
 
     if (match := RE_WIKI_LANG.match(target)):

docs/source/extensions/xkcd.py

@@ -117,7 +117,7 @@ def make_xkcd_link(name: str, rawtext: str, text: str, lineno: int, inliner: Inl
 
     :return: A list containing the created node, and a list containing any messages generated during the function.
     """
-    text = nodes.unescape(text)  # type: ignore[attr-defined]
+    text = nodes.unescape(text)
     _, title, target = split_explicit_title(text)
 
     endpoint: str = inliner.document.settings.env.config.xkcd_endpoint

tests/test_resource.py

@@ -742,7 +742,7 @@ def _build_test_resource_docker_image() -> str:
 
 
 class ExternalDockerWrapperTests(TestCase):
-    image = "concourse/mock-resource"
+    image = "concourse/mock-resource:0.13.0"
 
     @classmethod
     def setUpClass(cls) -> None:
@@ -929,7 +929,7 @@ def _format_debugging_message(message: str) -> str:
 
 
 class ExternalDockerConversionWrapperTests(TestCase):
-    image = "concourse/mock-resource"
+    image = "concourse/mock-resource:0.13.0"
 
     @classmethod
     def setUpClass(cls) -> None: