cleanup

Author: rickeylev

docs/BUILD.bazel

@@ -70,6 +70,7 @@ sphinx_docs(
     strip_prefix = package_name() + "/",
     tags = ["docs"],
     target_compatible_with = _TARGET_COMPATIBLE_WITH,
+    use_persistent_workers = True,
     deps = [
         ":bzl_api_docs",
         ":py_api_srcs",

sphinxdocs/private/sphinx.bzl

@@ -269,6 +269,8 @@ def _run_sphinx(ctx, format, source_path, inputs, output_prefix, use_persistent_
     run_args = []  # Copy of the args to forward along to debug runner
     args = ctx.actions.args()  # Args passed to the action
 
+    # NOTE: sphinx_build.py relies on the first two args being the srcdir and
+    # outputdir, in that order.
     args.add(source_path)
     args.add(output_dir.path)
 

sphinxdocs/private/sphinx_build.py

@@ -1,16 +1,12 @@
-import argparse
 import contextlib
 import io
 import json
 import logging
 import os
-import pathlib
 import shutil
 import sys
-import time
 import traceback
 import typing
-from pathlib import Path
 
 import sphinx.application
 from sphinx.cmd.build import main
@@ -34,8 +30,8 @@ def __init__(
         # Bazel send worker stderr to the worker log file.
         # outputBase=$(bazel info output_base)
         # find $outputBase/bazel-workers/ -type f -printf '%T@ %p\n' | sort -n | tail -1 | awk '{print $2}'
-        logging.basicConfig(level=logging.DEBUG)
-        logger.info("initializing worker")
+        logging.basicConfig(level=logging.WARN)
+        logger.info("Initializing worker")
 
         # The directory that paths are relative to.
         self._exec_root = exec_root
@@ -114,12 +110,6 @@ def _prepare_sphinx(self, request):
         for entry in request["inputs"]:
             path = entry["path"]
             digest = entry["digest"]
-
-            ##mtime = pathlib.Path(path).stat().st_mtime
-            ##logger.info("incoming path %s mtime: %s", path, mtime)
-            ### Sphinx appears to treat 0 mtime as always changed
-            ##os.utime(path, (100, 100))
-
             # Make the path srcdir-relative so Sphinx understands it.
             path = path.removeprefix(srcdir + "/")
             incoming_digests[path] = digest

sphinxdocs/tests/sphinx_docs/conf.py

@@ -5,7 +5,7 @@
 
 # -- Project info
 
-project = "Sphinx Docs Test xx"
+project = "Sphinx Docs Test"
 
 extensions = [
     "myst_parser",

sphinxdocs/tests/sphinx_docs/doc1.md

@@ -1,4 +1,3 @@
 # doc1
 
 hello doc 1
-x

sphinxdocs/tests/sphinx_docs/doc2.md

@@ -1,4 +1,3 @@
 # doc 2
 
-
 hello doc 3