From 7d064e519c6e89b6491b111bf6763d49ef2af405 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Thu, 9 Apr 2026 16:45:52 -0700 Subject: [PATCH 1/4] sphinxdocs: move tests docs to module-directory This just moves the tests and docs to the "top level", so that the layout resembles the more normal layout where e.g. tests are at the top level. --- docs/BUILD.bazel | 2 +- sphinxdocs/{sphinxdocs => }/docs/BUILD.bazel | 0 sphinxdocs/{sphinxdocs => }/docs/api/index.md | 0 .../docs/api/sphinxdocs/index.md | 0 .../docs/api/sphinxdocs/inventories/index.md | 0 sphinxdocs/{sphinxdocs => }/docs/index.md | 0 sphinxdocs/{sphinxdocs => }/docs/readthedocs.md | 0 sphinxdocs/{sphinxdocs => }/docs/sphinx-bzl.md | 0 .../{sphinxdocs => }/docs/starlark-docgen.md | 0 sphinxdocs/integration_tests/bcr/BUILD.bazel | 17 +++++++++++++++++ .../integration_tests/bcr/MODULE.bazel | 0 .../integration_tests/bcr/conf.py | 0 .../integration_tests/bcr/index.md | 0 sphinxdocs/sphinxdocs/BUILD.bazel | 6 +++++- .../integration_tests/bcr/BUILD.bazel | 7 ------- sphinxdocs/sphinxdocs/private/BUILD.bazel | 2 +- sphinxdocs/{sphinxdocs => }/tests/BUILD.bazel | 0 sphinxdocs/tests/__init__.py | 0 .../tests/proto_to_markdown/BUILD.bazel | 0 .../proto_to_markdown/proto_to_markdown_test.py | 0 .../tests/sphinx_docs/BUILD.bazel | 0 .../{sphinxdocs => }/tests/sphinx_docs/conf.py | 0 .../{sphinxdocs => }/tests/sphinx_docs/defs.bzl | 0 .../{sphinxdocs => }/tests/sphinx_docs/doc1.md | 0 .../{sphinxdocs => }/tests/sphinx_docs/doc2.md | 0 .../{sphinxdocs => }/tests/sphinx_docs/index.md | 0 .../tests/sphinx_stardoc/BUILD.bazel | 0 sphinxdocs/tests/sphinx_stardoc/__init__.py | 0 .../tests/sphinx_stardoc/aspect.md | 0 .../tests/sphinx_stardoc/bzl_function.bzl | 0 .../tests/sphinx_stardoc/bzl_providers.bzl | 0 .../tests/sphinx_stardoc/bzl_rule.bzl | 0 .../tests/sphinx_stardoc/bzl_typedef.bzl | 0 .../tests/sphinx_stardoc/conf.py | 0 .../tests/sphinx_stardoc/envvars.md | 0 .../tests/sphinx_stardoc/function.md | 0 .../tests/sphinx_stardoc/glossary.md | 0 .../tests/sphinx_stardoc/index.md | 0 .../tests/sphinx_stardoc/module_extension.md | 0 .../tests/sphinx_stardoc/provider.md | 0 .../tests/sphinx_stardoc/repo_rule.md | 0 .../tests/sphinx_stardoc/rule.md | 0 .../tests/sphinx_stardoc/sphinx_output_test.py | 2 +- .../tests/sphinx_stardoc/target.md | 0 .../tests/sphinx_stardoc/typedef.md | 0 .../tests/sphinx_stardoc/xrefs.md | 0 46 files changed, 25 insertions(+), 11 deletions(-) rename sphinxdocs/{sphinxdocs => }/docs/BUILD.bazel (100%) rename sphinxdocs/{sphinxdocs => }/docs/api/index.md (100%) rename sphinxdocs/{sphinxdocs => }/docs/api/sphinxdocs/index.md (100%) rename sphinxdocs/{sphinxdocs => }/docs/api/sphinxdocs/inventories/index.md (100%) rename sphinxdocs/{sphinxdocs => }/docs/index.md (100%) rename sphinxdocs/{sphinxdocs => }/docs/readthedocs.md (100%) rename sphinxdocs/{sphinxdocs => }/docs/sphinx-bzl.md (100%) rename sphinxdocs/{sphinxdocs => }/docs/starlark-docgen.md (100%) create mode 100644 sphinxdocs/integration_tests/bcr/BUILD.bazel rename sphinxdocs/{sphinxdocs => }/integration_tests/bcr/MODULE.bazel (100%) rename sphinxdocs/{sphinxdocs => }/integration_tests/bcr/conf.py (100%) rename sphinxdocs/{sphinxdocs => }/integration_tests/bcr/index.md (100%) delete mode 100644 sphinxdocs/sphinxdocs/integration_tests/bcr/BUILD.bazel rename sphinxdocs/{sphinxdocs => }/tests/BUILD.bazel (100%) create mode 100644 sphinxdocs/tests/__init__.py rename sphinxdocs/{sphinxdocs => }/tests/proto_to_markdown/BUILD.bazel (100%) rename sphinxdocs/{sphinxdocs => }/tests/proto_to_markdown/proto_to_markdown_test.py (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_docs/BUILD.bazel (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_docs/conf.py (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_docs/defs.bzl (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_docs/doc1.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_docs/doc2.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_docs/index.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/BUILD.bazel (100%) create mode 100644 sphinxdocs/tests/sphinx_stardoc/__init__.py rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/aspect.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/bzl_function.bzl (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/bzl_providers.bzl (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/bzl_rule.bzl (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/bzl_typedef.bzl (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/conf.py (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/envvars.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/function.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/glossary.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/index.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/module_extension.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/provider.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/repo_rule.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/rule.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/sphinx_output_test.py (98%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/target.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/typedef.md (100%) rename sphinxdocs/{sphinxdocs => }/tests/sphinx_stardoc/xrefs.md (100%) diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel index 1c31a47d56..80aae58607 100644 --- a/docs/BUILD.bazel +++ b/docs/BUILD.bazel @@ -73,7 +73,7 @@ sphinx_docs( ":bzl_api_docs", ":py_api_srcs", ":py_runtime_pair", - "@sphinxdocs//sphinxdocs/docs:docs_lib", + "@sphinxdocs//docs:docs_lib", ], ) diff --git a/sphinxdocs/sphinxdocs/docs/BUILD.bazel b/sphinxdocs/docs/BUILD.bazel similarity index 100% rename from sphinxdocs/sphinxdocs/docs/BUILD.bazel rename to sphinxdocs/docs/BUILD.bazel diff --git a/sphinxdocs/sphinxdocs/docs/api/index.md b/sphinxdocs/docs/api/index.md similarity index 100% rename from sphinxdocs/sphinxdocs/docs/api/index.md rename to sphinxdocs/docs/api/index.md diff --git a/sphinxdocs/sphinxdocs/docs/api/sphinxdocs/index.md b/sphinxdocs/docs/api/sphinxdocs/index.md similarity index 100% rename from sphinxdocs/sphinxdocs/docs/api/sphinxdocs/index.md rename to sphinxdocs/docs/api/sphinxdocs/index.md diff --git a/sphinxdocs/sphinxdocs/docs/api/sphinxdocs/inventories/index.md b/sphinxdocs/docs/api/sphinxdocs/inventories/index.md similarity index 100% rename from sphinxdocs/sphinxdocs/docs/api/sphinxdocs/inventories/index.md rename to sphinxdocs/docs/api/sphinxdocs/inventories/index.md diff --git a/sphinxdocs/sphinxdocs/docs/index.md b/sphinxdocs/docs/index.md similarity index 100% rename from sphinxdocs/sphinxdocs/docs/index.md rename to sphinxdocs/docs/index.md diff --git a/sphinxdocs/sphinxdocs/docs/readthedocs.md b/sphinxdocs/docs/readthedocs.md similarity index 100% rename from sphinxdocs/sphinxdocs/docs/readthedocs.md rename to sphinxdocs/docs/readthedocs.md diff --git a/sphinxdocs/sphinxdocs/docs/sphinx-bzl.md b/sphinxdocs/docs/sphinx-bzl.md similarity index 100% rename from sphinxdocs/sphinxdocs/docs/sphinx-bzl.md rename to sphinxdocs/docs/sphinx-bzl.md diff --git a/sphinxdocs/sphinxdocs/docs/starlark-docgen.md b/sphinxdocs/docs/starlark-docgen.md similarity index 100% rename from sphinxdocs/sphinxdocs/docs/starlark-docgen.md rename to sphinxdocs/docs/starlark-docgen.md diff --git a/sphinxdocs/integration_tests/bcr/BUILD.bazel b/sphinxdocs/integration_tests/bcr/BUILD.bazel new file mode 100644 index 0000000000..b9f3e16162 --- /dev/null +++ b/sphinxdocs/integration_tests/bcr/BUILD.bazel @@ -0,0 +1,17 @@ +load("@sphinxdocs//sphinxdocs:sphinx.bzl", "sphinx_build_binary", "sphinx_docs") + +sphinx_docs( + name = "docs", + srcs = ["index.md"], + config = "conf.py", + formats = ["html"], + sphinx = ":sphinx-build", +) + +sphinx_build_binary( + name = "sphinx-build", + deps = [ + "@dev_pip//myst_parser", + "@dev_pip//sphinx", + ], +) diff --git a/sphinxdocs/sphinxdocs/integration_tests/bcr/MODULE.bazel b/sphinxdocs/integration_tests/bcr/MODULE.bazel similarity index 100% rename from sphinxdocs/sphinxdocs/integration_tests/bcr/MODULE.bazel rename to sphinxdocs/integration_tests/bcr/MODULE.bazel diff --git a/sphinxdocs/sphinxdocs/integration_tests/bcr/conf.py b/sphinxdocs/integration_tests/bcr/conf.py similarity index 100% rename from sphinxdocs/sphinxdocs/integration_tests/bcr/conf.py rename to sphinxdocs/integration_tests/bcr/conf.py diff --git a/sphinxdocs/sphinxdocs/integration_tests/bcr/index.md b/sphinxdocs/integration_tests/bcr/index.md similarity index 100% rename from sphinxdocs/sphinxdocs/integration_tests/bcr/index.md rename to sphinxdocs/integration_tests/bcr/index.md diff --git a/sphinxdocs/sphinxdocs/BUILD.bazel b/sphinxdocs/sphinxdocs/BUILD.bazel index 893db8214a..5a498b197e 100644 --- a/sphinxdocs/sphinxdocs/BUILD.bazel +++ b/sphinxdocs/sphinxdocs/BUILD.bazel @@ -17,7 +17,7 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") load("//sphinxdocs/private:sphinx.bzl", "repeated_string_list_flag") package( - default_visibility = ["//sphinxdocs:__subpackages__"], + default_visibility = ["//:__subpackages__"], ) # Additional -D values to add to every Sphinx build. @@ -44,23 +44,27 @@ bool_flag( bzl_library( name = "sphinx_bzl", srcs = ["sphinx.bzl"], + visibility = ["//visibility:public"], deps = ["//sphinxdocs/private:sphinx_bzl"], ) bzl_library( name = "sphinx_docs_library_bzl", srcs = ["sphinx_docs_library.bzl"], + visibility = ["//visibility:public"], deps = ["//sphinxdocs/private:sphinx_docs_library_macro_bzl"], ) bzl_library( name = "sphinx_stardoc_bzl", srcs = ["sphinx_stardoc.bzl"], + visibility = ["//visibility:public"], deps = ["//sphinxdocs/private:sphinx_stardoc_bzl"], ) bzl_library( name = "readthedocs_bzl", srcs = ["readthedocs.bzl"], + visibility = ["//visibility:public"], deps = ["//sphinxdocs/private:readthedocs_bzl"], ) diff --git a/sphinxdocs/sphinxdocs/integration_tests/bcr/BUILD.bazel b/sphinxdocs/sphinxdocs/integration_tests/bcr/BUILD.bazel deleted file mode 100644 index 1aaa69b826..0000000000 --- a/sphinxdocs/sphinxdocs/integration_tests/bcr/BUILD.bazel +++ /dev/null @@ -1,7 +0,0 @@ -load("@sphinxdocs//sphinxdocs:sphinx.bzl", "sphinx_docs") - -sphinx_docs( - name = "docs", - srcs = ["index.md"], - conf = "conf.py", -) diff --git a/sphinxdocs/sphinxdocs/private/BUILD.bazel b/sphinxdocs/sphinxdocs/private/BUILD.bazel index 5a37cbd309..785d2e074d 100644 --- a/sphinxdocs/sphinxdocs/private/BUILD.bazel +++ b/sphinxdocs/sphinxdocs/private/BUILD.bazel @@ -18,7 +18,7 @@ load("@rules_python//python:py_binary.bzl", "py_binary") load("@rules_python//python:py_library.bzl", "py_library") package( - default_visibility = ["//sphinxdocs:__subpackages__"], + default_visibility = ["//:__subpackages__"], ) # These are only exported because they're passed as files to the @sphinxdocs diff --git a/sphinxdocs/sphinxdocs/tests/BUILD.bazel b/sphinxdocs/tests/BUILD.bazel similarity index 100% rename from sphinxdocs/sphinxdocs/tests/BUILD.bazel rename to sphinxdocs/tests/BUILD.bazel diff --git a/sphinxdocs/tests/__init__.py b/sphinxdocs/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sphinxdocs/sphinxdocs/tests/proto_to_markdown/BUILD.bazel b/sphinxdocs/tests/proto_to_markdown/BUILD.bazel similarity index 100% rename from sphinxdocs/sphinxdocs/tests/proto_to_markdown/BUILD.bazel rename to sphinxdocs/tests/proto_to_markdown/BUILD.bazel diff --git a/sphinxdocs/sphinxdocs/tests/proto_to_markdown/proto_to_markdown_test.py b/sphinxdocs/tests/proto_to_markdown/proto_to_markdown_test.py similarity index 100% rename from sphinxdocs/sphinxdocs/tests/proto_to_markdown/proto_to_markdown_test.py rename to sphinxdocs/tests/proto_to_markdown/proto_to_markdown_test.py diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_docs/BUILD.bazel b/sphinxdocs/tests/sphinx_docs/BUILD.bazel similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_docs/BUILD.bazel rename to sphinxdocs/tests/sphinx_docs/BUILD.bazel diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_docs/conf.py b/sphinxdocs/tests/sphinx_docs/conf.py similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_docs/conf.py rename to sphinxdocs/tests/sphinx_docs/conf.py diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_docs/defs.bzl b/sphinxdocs/tests/sphinx_docs/defs.bzl similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_docs/defs.bzl rename to sphinxdocs/tests/sphinx_docs/defs.bzl diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_docs/doc1.md b/sphinxdocs/tests/sphinx_docs/doc1.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_docs/doc1.md rename to sphinxdocs/tests/sphinx_docs/doc1.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_docs/doc2.md b/sphinxdocs/tests/sphinx_docs/doc2.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_docs/doc2.md rename to sphinxdocs/tests/sphinx_docs/doc2.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_docs/index.md b/sphinxdocs/tests/sphinx_docs/index.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_docs/index.md rename to sphinxdocs/tests/sphinx_docs/index.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/BUILD.bazel b/sphinxdocs/tests/sphinx_stardoc/BUILD.bazel similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/BUILD.bazel rename to sphinxdocs/tests/sphinx_stardoc/BUILD.bazel diff --git a/sphinxdocs/tests/sphinx_stardoc/__init__.py b/sphinxdocs/tests/sphinx_stardoc/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/aspect.md b/sphinxdocs/tests/sphinx_stardoc/aspect.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/aspect.md rename to sphinxdocs/tests/sphinx_stardoc/aspect.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/bzl_function.bzl b/sphinxdocs/tests/sphinx_stardoc/bzl_function.bzl similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/bzl_function.bzl rename to sphinxdocs/tests/sphinx_stardoc/bzl_function.bzl diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/bzl_providers.bzl b/sphinxdocs/tests/sphinx_stardoc/bzl_providers.bzl similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/bzl_providers.bzl rename to sphinxdocs/tests/sphinx_stardoc/bzl_providers.bzl diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/bzl_rule.bzl b/sphinxdocs/tests/sphinx_stardoc/bzl_rule.bzl similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/bzl_rule.bzl rename to sphinxdocs/tests/sphinx_stardoc/bzl_rule.bzl diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/bzl_typedef.bzl b/sphinxdocs/tests/sphinx_stardoc/bzl_typedef.bzl similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/bzl_typedef.bzl rename to sphinxdocs/tests/sphinx_stardoc/bzl_typedef.bzl diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/conf.py b/sphinxdocs/tests/sphinx_stardoc/conf.py similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/conf.py rename to sphinxdocs/tests/sphinx_stardoc/conf.py diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/envvars.md b/sphinxdocs/tests/sphinx_stardoc/envvars.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/envvars.md rename to sphinxdocs/tests/sphinx_stardoc/envvars.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/function.md b/sphinxdocs/tests/sphinx_stardoc/function.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/function.md rename to sphinxdocs/tests/sphinx_stardoc/function.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/glossary.md b/sphinxdocs/tests/sphinx_stardoc/glossary.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/glossary.md rename to sphinxdocs/tests/sphinx_stardoc/glossary.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/index.md b/sphinxdocs/tests/sphinx_stardoc/index.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/index.md rename to sphinxdocs/tests/sphinx_stardoc/index.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/module_extension.md b/sphinxdocs/tests/sphinx_stardoc/module_extension.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/module_extension.md rename to sphinxdocs/tests/sphinx_stardoc/module_extension.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/provider.md b/sphinxdocs/tests/sphinx_stardoc/provider.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/provider.md rename to sphinxdocs/tests/sphinx_stardoc/provider.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/repo_rule.md b/sphinxdocs/tests/sphinx_stardoc/repo_rule.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/repo_rule.md rename to sphinxdocs/tests/sphinx_stardoc/repo_rule.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/rule.md b/sphinxdocs/tests/sphinx_stardoc/rule.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/rule.md rename to sphinxdocs/tests/sphinx_stardoc/rule.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py b/sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py similarity index 98% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py rename to sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py index c78089ac14..c439fe885e 100644 --- a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py +++ b/sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py @@ -3,7 +3,7 @@ from absl.testing import absltest, parameterized -from sphinxdocs.tests import sphinx_stardoc +import tests.sphinx_stardoc as sphinx_stardoc class SphinxOutputTest(parameterized.TestCase): diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/target.md b/sphinxdocs/tests/sphinx_stardoc/target.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/target.md rename to sphinxdocs/tests/sphinx_stardoc/target.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/typedef.md b/sphinxdocs/tests/sphinx_stardoc/typedef.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/typedef.md rename to sphinxdocs/tests/sphinx_stardoc/typedef.md diff --git a/sphinxdocs/sphinxdocs/tests/sphinx_stardoc/xrefs.md b/sphinxdocs/tests/sphinx_stardoc/xrefs.md similarity index 100% rename from sphinxdocs/sphinxdocs/tests/sphinx_stardoc/xrefs.md rename to sphinxdocs/tests/sphinx_stardoc/xrefs.md From 184e54bd008b56a6a036f561545843b3c403a5d9 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Fri, 10 Apr 2026 12:38:02 -0700 Subject: [PATCH 2/4] Update integration_tests/bcr to match API changes and add missing deps --- sphinxdocs/integration_tests/bcr/BUILD.bazel | 7 +++++++ sphinxdocs/integration_tests/bcr/MODULE.bazel | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/sphinxdocs/integration_tests/bcr/BUILD.bazel b/sphinxdocs/integration_tests/bcr/BUILD.bazel index b9f3e16162..480ba30c71 100644 --- a/sphinxdocs/integration_tests/bcr/BUILD.bazel +++ b/sphinxdocs/integration_tests/bcr/BUILD.bazel @@ -15,3 +15,10 @@ sphinx_build_binary( "@dev_pip//sphinx", ], ) + +load("@bazel_skylib//rules:build_test.bzl", "build_test") + +build_test( + name = "docs_build_test", + targets = [":docs"], +) diff --git a/sphinxdocs/integration_tests/bcr/MODULE.bazel b/sphinxdocs/integration_tests/bcr/MODULE.bazel index 6a25aa5e4c..8bda8c4a12 100644 --- a/sphinxdocs/integration_tests/bcr/MODULE.bazel +++ b/sphinxdocs/integration_tests/bcr/MODULE.bazel @@ -14,3 +14,15 @@ local_path_override( module_name = "rules_python", path = "../../..", ) +dev_pip = use_extension( + "@rules_python//python/extensions:pip.bzl", + "pip", + dev_dependency = True, +) +dev_pip.parse( + hub_name = "dev_pip", + python_version = "3.11", + requirements_lock = "@rules_python//docs:requirements.txt", +) +use_repo(dev_pip, "dev_pip") +bazel_dep(name = "bazel_skylib", version = "1.8.2") From a545c63563e678e298ad26101526402b8ddc5827 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Fri, 10 Apr 2026 12:40:23 -0700 Subject: [PATCH 3/4] Update .bazelrc.deleted_packages to match new bcr test module location --- sphinxdocs/.bazelrc.deleted_packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinxdocs/.bazelrc.deleted_packages b/sphinxdocs/.bazelrc.deleted_packages index fd6d39d64f..442c80e960 100644 --- a/sphinxdocs/.bazelrc.deleted_packages +++ b/sphinxdocs/.bazelrc.deleted_packages @@ -1 +1 @@ -common --deleted_packages=sphinxdocs/integration_tests/bcr +common --deleted_packages=integration_tests/bcr From 5288d41132f793dd763143eac60d016efe36b14c Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Fri, 10 Apr 2026 15:33:47 -0700 Subject: [PATCH 4/4] format --- sphinxdocs/integration_tests/bcr/BUILD.bazel | 3 +-- sphinxdocs/integration_tests/bcr/MODULE.bazel | 2 ++ sphinxdocs/tests/proto_to_markdown/proto_to_markdown_test.py | 3 +-- sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sphinxdocs/integration_tests/bcr/BUILD.bazel b/sphinxdocs/integration_tests/bcr/BUILD.bazel index 480ba30c71..412ba56ec3 100644 --- a/sphinxdocs/integration_tests/bcr/BUILD.bazel +++ b/sphinxdocs/integration_tests/bcr/BUILD.bazel @@ -1,3 +1,4 @@ +load("@bazel_skylib//rules:build_test.bzl", "build_test") load("@sphinxdocs//sphinxdocs:sphinx.bzl", "sphinx_build_binary", "sphinx_docs") sphinx_docs( @@ -16,8 +17,6 @@ sphinx_build_binary( ], ) -load("@bazel_skylib//rules:build_test.bzl", "build_test") - build_test( name = "docs_build_test", targets = [":docs"], diff --git a/sphinxdocs/integration_tests/bcr/MODULE.bazel b/sphinxdocs/integration_tests/bcr/MODULE.bazel index 8bda8c4a12..711144df9b 100644 --- a/sphinxdocs/integration_tests/bcr/MODULE.bazel +++ b/sphinxdocs/integration_tests/bcr/MODULE.bazel @@ -14,6 +14,7 @@ local_path_override( module_name = "rules_python", path = "../../..", ) + dev_pip = use_extension( "@rules_python//python/extensions:pip.bzl", "pip", @@ -25,4 +26,5 @@ dev_pip.parse( requirements_lock = "@rules_python//docs:requirements.txt", ) use_repo(dev_pip, "dev_pip") + bazel_dep(name = "bazel_skylib", version = "1.8.2") diff --git a/sphinxdocs/tests/proto_to_markdown/proto_to_markdown_test.py b/sphinxdocs/tests/proto_to_markdown/proto_to_markdown_test.py index da6edb21d4..c42bcf0b22 100644 --- a/sphinxdocs/tests/proto_to_markdown/proto_to_markdown_test.py +++ b/sphinxdocs/tests/proto_to_markdown/proto_to_markdown_test.py @@ -17,9 +17,8 @@ from absl.testing import absltest from google.protobuf import text_format -from stardoc.proto import stardoc_output_pb2 - from sphinxdocs.private import proto_to_markdown +from stardoc.proto import stardoc_output_pb2 _EVERYTHING_MODULE = """\ module_docstring: "MODULE_DOC_STRING" diff --git a/sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py b/sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py index c439fe885e..4ed6d4df94 100644 --- a/sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py +++ b/sphinxdocs/tests/sphinx_stardoc/sphinx_output_test.py @@ -1,9 +1,8 @@ import importlib.resources from xml.etree import ElementTree -from absl.testing import absltest, parameterized - import tests.sphinx_stardoc as sphinx_stardoc +from absl.testing import absltest, parameterized class SphinxOutputTest(parameterized.TestCase):