Merge remote-tracking branch 'origin/main' into adamtheturtle/flask-response-delay

# Conflicts:
#	CHANGELOG.rst

Author: adamtheturtle

.github/workflows/release.yml

@@ -4,21 +4,18 @@ name: Release
 on: workflow_dispatch
 
 jobs:
-  build:
-    name: Publish a release
+  release:
+    name: Create release
     runs-on: ubuntu-latest
 
-    # Specifying an environment is strongly recommended by PyPI.
-    # See https://github.com/pypa/gh-action-pypi-publish/tree/release/v1/?tab=readme-ov-file#trusted-publishing.
-    environment: release
-
     permissions:
-      # This is needed for PyPI publishing.
-      # See https://github.com/pypa/gh-action-pypi-publish/tree/release/v1/?tab=readme-ov-file#trusted-publishing.
-      id-token: write
       # This is needed for https://github.com/stefanzweifel/git-auto-commit-action.
       contents: write
 
+    outputs:
+      version: ${{ steps.calver.outputs.release }}
+      tag: ${{ steps.tag_version.outputs.new_tag }}
+
     steps:
       - uses: actions/checkout@v6
         with:
@@ -36,12 +33,6 @@ jobs:
           # The default GITHUB_TOKEN cannot bypass rulesets.
           token: ${{ secrets.RELEASE_PAT }}
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-        with:
-          enable-cache: true
-          cache-dependency-glob: '**/pyproject.toml'
-
       - name: Calver calculate version
         uses: StephaneBour/actions-calver@master
         id: calver
@@ -102,10 +93,37 @@ jobs:
           name: Release ${{ steps.tag_version.outputs.new_tag }}
           body: ${{ steps.tag_version.outputs.changelog }}
 
+  pypi:
+    name: Publish to PyPI
+    needs: release
+    runs-on: ubuntu-latest
+
+    # Specifying an environment is strongly recommended by PyPI.
+    # See https://github.com/pypa/gh-action-pypi-publish/tree/release/v1/?tab=readme-ov-file#trusted-publishing.
+    environment: release
+
+    permissions:
+      # This is needed for PyPI publishing.
+      # See https://github.com/pypa/gh-action-pypi-publish/tree/release/v1/?tab=readme-ov-file#trusted-publishing.
+      id-token: write
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ needs.release.outputs.tag }}
+          # Fetch all history including tags.
+          # Needed for setuptools-scm version detection.
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+          cache-dependency-glob: '**/pyproject.toml'
+
       - name: Build a binary wheel and a source tarball
         run: |
-          git fetch --tags
-          git checkout ${{ steps.tag_version.outputs.new_tag }}
           uv build --sdist --wheel --out-dir dist/
           uv run --extra=release check-wheel-contents dist/*.whl
 
@@ -116,6 +134,29 @@ jobs:
         with:
           verbose: true
 
+  docker:
+    name: Publish Docker image (${{ matrix.image.target }})
+    needs: release
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        image:
+          - target: target-manager
+            repo: adamtheturtle/vuforia-target-manager-mock
+          - target: vws
+            repo: adamtheturtle/vuforia-vws-mock
+          - target: vwq
+            repo: adamtheturtle/vuforia-vwq-mock
+
+    permissions: {}
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ needs.release.outputs.tag }}
+          persist-credentials: false
+
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -128,35 +169,13 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
-      - name: Build and push target manager Docker image
-        uses: docker/build-push-action@v6.19.2
-        with:
-          file: src/mock_vws/_flask_server/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          target: target-manager
-          tags: |
-            adamtheturtle/vuforia-target-manager-mock:latest
-            adamtheturtle/vuforia-target-manager-mock:${{ steps.calver.outputs.release }}
-
-      - name: Build and push VWS Docker image
-        uses: docker/build-push-action@v6.19.2
-        with:
-          file: src/mock_vws/_flask_server/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          target: vws
-          tags: |
-            adamtheturtle/vuforia-vws-mock:latest
-            adamtheturtle/vuforia-vws-mock:${{ steps.calver.outputs.release }}
-
-      - name: Build and push VWQ Docker image
+      - name: Build and push Docker image
         uses: docker/build-push-action@v6.19.2
         with:
           file: src/mock_vws/_flask_server/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          target: vwq
+          target: ${{ matrix.image.target }}
           tags: |-
-            adamtheturtle/vuforia-vwq-mock:latest
-            adamtheturtle/vuforia-vwq-mock:${{ steps.calver.outputs.release }}
+            ${{ matrix.image.repo }}:latest
+            ${{ matrix.image.repo }}:${{ needs.release.outputs.version }}

pyproject.toml

@@ -361,6 +361,7 @@ search_path = [
     ".",
     "src",
 ]
+errors.non-exhaustive-match = "error"
 
 [tool.pyright]
 enableTypeIgnoreComments = false

src/mock_vws/_flask_server/target_manager.py

@@ -45,8 +45,8 @@ def to_target_rater(self) -> TargetTrackingRater:
                 return HardcodedTargetTrackingRater(rating=5)
             case self.RANDOM:
                 return RandomTargetTrackingRater()
-
-        raise ValueError  # pragma: no cover
+            case _:  # pragma: no cover
+                raise ValueError
 
 
 @beartype

src/mock_vws/_flask_server/vwq.py

@@ -46,8 +46,8 @@ def to_image_matcher(self) -> ImageMatcher:
                 return ExactMatcher()
             case self.STRUCTURAL_SIMILARITY:
                 return StructuralSimilarityMatcher()
-
-        raise ValueError  # pragma: no cover
+            case _:  # pragma: no cover
+                raise ValueError
 
 
 @beartype

src/mock_vws/_flask_server/vws.py

@@ -60,8 +60,8 @@ def to_image_matcher(self) -> ImageMatcher:
                 return ExactMatcher()
             case self.STRUCTURAL_SIMILARITY:
                 return StructuralSimilarityMatcher()
-
-        raise ValueError  # pragma: no cover
+            case _:  # pragma: no cover
+                raise ValueError
 
 
 @beartype