Merge branch 'main' into indexsidebar

Author: AA-Turner

.github/workflows/test.yml

@@ -41,13 +41,12 @@ jobs:
 
   unit:
     name: Unit tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version:
-        - "3.13"
-        - "3.14"
+        python-version: ["3.13", "3.14"]
+        os: [windows-latest, macos-latest, ubuntu-latest]
 
     steps:
     - uses: actions/checkout@v4
@@ -69,5 +68,6 @@ jobs:
     - name: Upload coverage
       uses: codecov/codecov-action@v5
       with:
+        flags: ${{ matrix.os }}
         name: Python ${{ matrix.python-version }}
         token: ${{ secrets.CODECOV_ORG_TOKEN }}

build_docs.py

@@ -463,7 +463,7 @@ def setup_switchers(script_content: bytes, html_root: Path) -> None:
     - Cross-link various versions in a version switcher
     """
     switchers_path = html_root / "_static" / "switchers.js"
-    switchers_path.write_text(script_content, encoding="UTF-8")
+    switchers_path.write_bytes(script_content)
 
     for file in html_root.glob("**/*.html"):
         depth = len(file.relative_to(html_root).parts) - 1
@@ -910,20 +910,21 @@ def _checkout_name(select_output: str | None) -> str:
     return "cpython"
 
 
-def main() -> None:
+def main() -> int:
     """Script entry point."""
     args = parse_args()
     setup_logging(args.log_directory, args.select_output)
     load_environment_variables()
 
     if args.select_output is None:
-        build_docs_with_lock(args, "build_docs.lock")
-    elif args.select_output == "no-html":
-        build_docs_with_lock(args, "build_docs_archives.lock")
-    elif args.select_output == "only-html":
-        build_docs_with_lock(args, "build_docs_html.lock")
-    elif args.select_output == "only-html-en":
-        build_docs_with_lock(args, "build_docs_html_en.lock")
+        return build_docs_with_lock(args, "build_docs.lock")
+    if args.select_output == "no-html":
+        return build_docs_with_lock(args, "build_docs_archives.lock")
+    if args.select_output == "only-html":
+        return build_docs_with_lock(args, "build_docs_html.lock")
+    if args.select_output == "only-html-en":
+        return build_docs_with_lock(args, "build_docs_html_en.lock")
+    return EX_FAILURE
 
 
 def parse_args() -> argparse.Namespace:
@@ -1072,12 +1073,12 @@ def build_docs_with_lock(args: argparse.Namespace, lockfile_name: str) -> int:
         return EX_FAILURE
 
     try:
-        return EX_OK if build_docs(args) else EX_FAILURE
+        return build_docs(args)
     finally:
         lock.close()
 
 
-def build_docs(args: argparse.Namespace) -> bool:
+def build_docs(args: argparse.Namespace) -> int:
     """Build all docs (each language and each version)."""
     logging.info("Full build start.")
     start_time = perf_counter()
@@ -1160,7 +1161,7 @@ def build_docs(args: argparse.Namespace) -> bool:
 
     logging.info("Full build done (%s).", format_seconds(perf_counter() - start_time))
 
-    return any_build_failed
+    return EX_FAILURE if any_build_failed else EX_OK
 
 
 def parse_versions_from_devguide(http: urllib3.PoolManager) -> Versions:
@@ -1404,4 +1405,4 @@ def purge_surrogate_key(http: urllib3.PoolManager, surrogate_key: str) -> None:
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    raise SystemExit(main())