More minor internal coverage related settings and setup tweaks.

Julian · Julian · commit abc37b531052 · 2023-05-24T13:16:21.000-04:00
diff --git a/noxfile.py b/noxfile.py
@@ -9,7 +9,13 @@
 CHANGELOG = ROOT / "CHANGELOG.rst"
 DOCS = ROOT / "docs"
 
-EXTRAS = ["", "[format]", "[format-nongpl]"]
+INSTALLABLE = [
+    nox.param(value, id=name) for name, value in [
+        ("no-extras", ROOT),
+        ("format", f"{ROOT}[format]"),
+        ("format-nongpl", f"{ROOT}[format-nongpl]"),
+    ]
+]
 
 NONGPL_LICENSES = [
     "Apache Software License",
@@ -21,7 +27,6 @@
 ]
 
 
-
 nox.options.sessions = []
 
 
@@ -35,36 +40,45 @@ def _session(fn):
 
 
 @session(python=["3.8", "3.9", "3.10", "3.11", "pypy3"])
-@nox.parametrize("extras", EXTRAS)
-def tests(session, extras):
+@nox.parametrize("installable", INSTALLABLE)
+def tests(session, installable):
 
     env = dict(JSON_SCHEMA_TEST_SUITE=str(ROOT / "json"))
 
-    session.install("virtue", f"{ROOT}{extras}")
+    session.install("virtue", installable)
+
+    if session.posargs and session.posargs[0] in {"coverage", "ghcoverage"}:
+        ghcoverage = session.posargs.pop(0) == "ghcoverage"
 
-    ghcoverage = session.posargs == ["ghcoverage"]
-    if session.posargs == ["coverage"] or ghcoverage:
         session.install("coverage[toml]")
-        session.run("coverage", "run", "-m", "virtue", PACKAGE, env=env)
+        session.run(
+            "coverage",
+            "run",
+            *session.posargs,
+            "-m",
+            "virtue",
+            PACKAGE,
+            env=env,
+        )
         session.run("coverage", "report")
+
+        if ghcoverage:
+            session.run(
+                "sh",
+                ROOT / ".github/coverage.sh",
+                f"{session.bin}/python",
+            )
     else:
         session.run("virtue", *session.posargs, PACKAGE, env=env)
 
-    if ghcoverage:
-        session.run(
-            "sh",
-            ROOT / ".github/coverage.sh",
-            f"{session.bin}/python",
-        )
-
 
 @session()
-@nox.parametrize("extras", EXTRAS)
-def audit(session, extras):
-    session.install("pip-audit", f"{ROOT}{extras}")
+@nox.parametrize("installable", INSTALLABLE)
+def audit(session, installable):
+    session.install("pip-audit", installable)
     session.run("python", "-m", "pip_audit")
 
-    if "nongpl" in extras:
+    if "format-nongpl" in installable:
         session.install("pip-licenses")
         session.run(
             "python",
diff --git a/pyproject.toml b/pyproject.toml
@@ -100,6 +100,9 @@ Release Information
 path = "CHANGELOG.rst"
 pattern = "(^v.+?)\nv"
 
+[tool.coverage.html]
+show_contexts = true
+
 [tool.coverage.run]
 branch = true
 source = ["jsonschema"]
@@ -115,6 +118,8 @@ omit = [
   "*/jsonschema/benchmarks/*",
   "*/jsonschema/tests/fuzz_validate.py",
 ]
+show_missing = true
+skip_covered = true
 
 [tool.doc8]
 ignore = [
