Cleanup

Author: MaximilianSoerenPollak

src/extensions/score_plantuml.py

@@ -34,40 +34,6 @@
 logger = logging.getLogger(__name__)
 
 
-# def get_runfiles_dir() -> Path:
-#     if r := os.getenv("RUNFILES_DIR"):
-#         # Runfiles are only available when running in Bazel.
-#         # bazel build and bazel run are both supported.
-#         # i.e. `bazel build //:docs` and `bazel run //:docs`.
-#         logger.debug("Using runfiles to determine plantuml path.")
-#
-#         runfiles_dir = Path(r)
-#
-#     else:
-#         # The only way to land here is when running from within the virtual
-#         # environment created by the `:ide_support` rule in the BUILD file.
-#         # i.e. esbonio or manual sphinx-build execution within the virtual
-#         # environment.
-#         # We'll still use the plantuml binary from the bazel build.
-#         # But we need to find it first.
-#         logger.debug("Running outside bazel.")
-#
-#         git_root = Path.cwd().resolve()
-#         while not (git_root / ".git").exists():
-#             git_root = git_root.parent
-#             if git_root == Path("/"):
-#                 sys.exit("Could not find git root.")
-#
-#         runfiles_dir = git_root / "bazel-bin" / "ide_support.runfiles"
-#
-#     if not runfiles_dir.exists():
-#         sys.exit(
-#             f"Could not find runfiles_dir at {runfiles_dir}. "
-#             "Have a look at README.md for instructions on how to build docs."
-#         )
-#     return runfiles_dir
-
-
 def find_correct_path(runfiles: Path) -> Path:
     """
     This ensures that the 'plantuml' binary path is found in local 'score_docs_as_code'

src/helper_lib/__init__.py

@@ -178,30 +178,12 @@ def get_current_git_hash(git_root: Path) -> str:
         raise
 
 
-# def find_git_root(starting_path: Path | None = None) -> Path:
-#     workspace = os.getenv("BUILD_WORKSPACE_DIRECTORY")
-#     if workspace:
-#         return Path(workspace)
-#     current: Path = (starting_path or Path(__file__)).resolve()
-#     for parent in current.parents:
-#         if (parent / ".git").exists():
-#             return parent
-#     sys.exit(
-#         "Could not find git root. "
-#         + "Please run this script from the root of the repository."
-#     )
-
-
-def get_runfiles_dir(start_path: Path | None = None):
+def get_runfiles_dir():
     """
     Find the Bazel runfiles directory using bazel_runfiles convention,
     fallback to RUNFILES_DIR or relative traversal if needed.
     """
     # This makes testing much easier
-    # if start_path is None:
-    #     cwd = Path.cwd()
-    # else:
-    #     cwd = start_path
     if (r := Runfiles.Create()) and (rd := r.EnvVars().get("RUNFILES_DIR")):
         runfiles_dir = Path(rd)
     else:

src/helper_lib/test_helper_lib.py

@@ -271,7 +271,7 @@ def test_git_root_search_success(git_repo: Path, monkeypatch: pytest.MonkeyPatch
     # Have to monkeypatch in order to allow us to test
     # the 'else' path inside 'get_runfiles_dir'
     monkeypatch.setattr(Path, "cwd", lambda: docs_dir)
-    result = get_runfiles_dir(start_path=docs_dir)
+    result = get_runfiles_dir()
     assert Path(result) == runfiles_dir