Tidy up a bit

Author: adamtheturtle

.github/workflows/test.yml

@@ -253,6 +253,12 @@ jobs:
         run: |
           # We use pytest-xdist to make this run much faster.
           # The downside is that we cannot use -s / --capture=no.
+          #
+          # We use coverage to collect coverage data but we currently
+          # do not upload / use it because combining Windows and Linux
+          # coverage is challenging.
+          #
+          # We therefore have a few ``# pragma: no cover`` statements.
           uv run --extra=dev \
             coverage run \
             --parallel-mode \
@@ -267,15 +273,6 @@ jobs:
         env:
           UV_PYTHON: ${{ matrix.python-version }}
 
-    #   - name: Upload coverage data
-    #     uses: actions/upload-artifact@v4
-    #     with:
-    #       name: coverage-data-windows-${{ matrix.python-version }}
-    #       path: .coverage.*
-    #       include-hidden-files: true
-    #       if-no-files-found: error
-
-  # Coverage combination and enforcement
   coverage:
     name: Combine & check coverage
     needs: [ci-tests, skip-tests, windows-tests]

pyproject.toml

@@ -52,6 +52,7 @@ optional-dependencies.dev = [
     "actionlint-py==1.7.7.23",
     "check-manifest==0.50",
     "check-wheel-contents==0.6.3",
+    "coverage==7.10.7",
     "deptry==0.23.1",
     "dirty-equals==0.10.0",
     "doc8==1.1.1",
@@ -72,7 +73,6 @@ optional-dependencies.dev = [
     "pyright==1.1.406",
     "pyroma==5.0",
     "pytest==8.4.2",
-    "pytest-cov==7.0.0",
     "pytest-retry==1.7.0",
     "pytest-xdist==3.8.0",
     "python-dotenv==1.1.1",

tests/mock_vws/test_docker.py

@@ -65,7 +65,9 @@ def fixture_custom_bridge_network() -> Iterator[Network]:
     name = "test-vws-bridge-" + uuid.uuid4().hex
     try:
         network = client.networks.create(name=name, driver="bridge")
-    except NotFound:
+    # We skip coverage here because combining Windows and Linux coverage
+    # is challenging.
+    except NotFound:  # pragma: no cover
         # On Windows the "bridge" network driver is not available and we use
         # the "nat" driver instead.
         network = client.networks.create(name=name, driver="nat")
@@ -116,15 +118,15 @@ def test_build_and_run(
             target="target-manager",
             rm=True,
         )
-    except BuildError as exc:
+    # We skip coverage here because combining Windows and Linux coverage
+    # is challenging.
+    except BuildError as exc:  # pragma: no cover
         full_log = "\n".join(
             [item["stream"] for item in exc.build_log if "stream" in item],
         )
         # If this assertion fails, it may be useful to look at the other
         # properties of ``exc``.
-        if (
-            "no matching manifest for windows/amd64" not in exc.msg
-        ):  # pragma: no cover
+        if "no matching manifest for windows/amd64" not in exc.msg:
             raise AssertionError(full_log) from exc
         pytest.skip(
             reason="We do not currently support using Windows containers."