Merge branch 'main' into support_bazel_5

Author: cpsauer

.pre-commit-config.yaml

@@ -7,9 +7,7 @@ repos:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-ast
-        exclude: ^check_python_version\.template\.py$  # Template for bazel creates syntax error
     -   id: debug-statements
-        exclude: ^check_python_version\.template\.py$  # Template for bazel creates syntax error
     -   id: mixed-line-ending
     -   id: check-case-conflict
     -   id: fix-byte-order-marker

BUILD

@@ -15,7 +15,10 @@ filegroup(
     name = "bzl_srcs_for_stardoc",
     visibility = ["//visibility:public"],
     srcs = glob(["**/*.bzl"]) + [
-        "@bazel_tools//:bzl_srcs"
+        "@bazel_tools//tools:bzl_srcs",
+        "@hedron_compile_commands_pip//:requirements.bzl",
+        "@python_3_11//:defs.bzl",
+        "@rules_python//:bzl",
     ],
 )
 
@@ -25,7 +28,7 @@ filegroup(
 # Implementation:
 # If you are looking into the implementation, start with the overview in ImplementationReadme.md.
 
-exports_files(["refresh.template.py", "check_python_version.template.py"])  # For implicit use by the refresh_compile_commands macro, not direct use.
+exports_files(["refresh.template.py"])  # For implicit use by the refresh_compile_commands macro, not direct use.
 
 cc_binary(
     name = "print_args",

MODULE.bazel

@@ -1,3 +1,23 @@
 module(name = "hedron_compile_commands")
 
 use_extension("//:workspace_setup.bzl", "hedron_compile_commands_extension")
+use_extension("//:workspace_setup_transitive.bzl", "hedron_compile_commands_extension")
+use_extension("//:workspace_setup_transitive_transitive.bzl", "hedron_compile_commands_extension")
+use_extension("//:workspace_setup_transitive_transitive_transitive.bzl", "hedron_compile_commands_extension")
+
+# While we're supporting the WORKSPACE, we need to load rules_python through its WORKSPACE mechanism because the (currently unstable) bzlmod APIs differ just enough that loads would fail if you tried to support both at the same time.
+# But this is how you'd load rules_python from bzlmod:
+# bazel_dep(name = "rules_python", version = "0.27.1")
+# python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+# python.toolchain(
+#     python_version = "3.11",
+# )
+# use_repo(python, "python_versions")
+# pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
+# pip.parse(
+#     hub_name = "hedron_compile_commands_pip",
+#     # Available versions are listed in @rules_python//python:versions.bzl.
+#     python_version = "3.11",
+#     requirements_lock = "//:requirements.txt",
+# )
+# use_repo(pip, "hedron_compile_commands_pip")

README.md

@@ -54,7 +54,7 @@ bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
 git_override(
     module_name = "hedron_compile_commands",
     remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
-    commit = "daae6f40adfa5fdb7c89684cbe4d88b691c63b2d",
+    commit = "0e5b1aa26d87a431d2a52676d0b9ce469448ee54",
     # Replace the commit hash (above) with the latest (https://github.com/hedronvision/bazel-compile-commands-extractor/commits/main).
     # Even better, set up Renovate and let it do the work for you (see "Suggestion: Updates" in the README).
 )
@@ -73,14 +73,20 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "hedron_compile_commands",
 
-    # Replace the commit hash (daae6f40adfa5fdb7c89684cbe4d88b691c63b2d) in both places (below) with the latest (https://github.com/hedronvision/bazel-compile-commands-extractor/commits/main), rather than using the stale one here.
+    # Replace the commit hash (0e5b1aa26d87a431d2a52676d0b9ce469448ee54) in both places (below) with the latest (https://github.com/hedronvision/bazel-compile-commands-extractor/commits/main), rather than using the stale one here.
     # Even better, set up Renovate and let it do the work for you (see "Suggestion: Updates" in the README).
-    url = "https://github.com/hedronvision/bazel-compile-commands-extractor/archive/daae6f40adfa5fdb7c89684cbe4d88b691c63b2d.tar.gz",
-    strip_prefix = "bazel-compile-commands-extractor-daae6f40adfa5fdb7c89684cbe4d88b691c63b2d",
+    url = "https://github.com/hedronvision/bazel-compile-commands-extractor/archive/0e5b1aa26d87a431d2a52676d0b9ce469448ee54.tar.gz",
+    strip_prefix = "bazel-compile-commands-extractor-0e5b1aa26d87a431d2a52676d0b9ce469448ee54",
     # When you first run this tool, it'll recommend a sha256 hash to put here with a message like: "DEBUG: Rule 'hedron_compile_commands' indicated that a canonical reproducible form can be obtained by modifying arguments sha256 = ..."
 )
 load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")
 hedron_compile_commands_setup()
+load("@hedron_compile_commands//:workspace_setup_transitive.bzl", "hedron_compile_commands_setup_transitive")
+hedron_compile_commands_setup_transitive()
+load("@hedron_compile_commands//:workspace_setup_transitive_transitive.bzl", "hedron_compile_commands_setup_transitive_transitive")
+hedron_compile_commands_setup_transitive_transitive()
+load("@hedron_compile_commands//:workspace_setup_transitive_transitive_transitive.bzl", "hedron_compile_commands_setup_transitive_transitive_transitive")
+hedron_compile_commands_setup_transitive_transitive_transitive()
 ```
 
 #### Either way: Get Updates via Renovate

WORKSPACE

@@ -6,3 +6,9 @@ workspace(name = "hedron_compile_commands")
 
 load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")
 hedron_compile_commands_setup()
+load("@hedron_compile_commands//:workspace_setup_transitive.bzl", "hedron_compile_commands_setup_transitive")
+hedron_compile_commands_setup_transitive()
+load("@hedron_compile_commands//:workspace_setup_transitive_transitive.bzl", "hedron_compile_commands_setup_transitive_transitive")
+hedron_compile_commands_setup_transitive_transitive()
+load("@hedron_compile_commands//:workspace_setup_transitive_transitive_transitive.bzl", "hedron_compile_commands_setup_transitive_transitive_transitive")
+hedron_compile_commands_setup_transitive_transitive_transitive()