Update to new stardoc so we can work with bzlmod. (bazelbuild#853)

* Update to new stardoc so we can work with bzlmod.
* Requires update to merge.py to account for stardoc changes.
* put integration test back on bazel at head.

Fixes bazelbuild#808

.bazelci/integration.yml

@@ -11,8 +11,4 @@ tasks:
   integration:
     name: rolling_distro
     platform: ubuntu1804
-    # See https://github.com/bazelbuild/rules_pkg/issues/808
-    bazel: 7.0.0
-    build_flags:
-    - "--noenable_bzlmod"
     <<: *common

MODULE.bazel

@@ -12,8 +12,8 @@ bazel_dep(name = "bazel_skylib", version = "1.2.0")
 
 # Only for development
 bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True)
-bazel_dep(name = "stardoc", version = "0.5.3", dev_dependency = True)
 bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
+bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True)
 
 # Find the system rpmbuild if one is available.
 find_rpm = use_extension("//toolchains/rpm:rpmbuild_configure.bzl", "find_system_rpmbuild_bzlmod", dev_dependency = True)

doc_build/BUILD

@@ -20,7 +20,7 @@ How to:
 """
 
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-load("@bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
+load("@stardoc//stardoc:stardoc.bzl", "stardoc")
 load("//:version.bzl", "version")
 
 package(default_applicable_licenses = ["//:license"])

doc_build/merge.py

@@ -23,7 +23,7 @@
 import typing
 
 
-ID_RE = re.compile(r'<a id="#(.*)">')
+ID_RE = re.compile(r'<a id="(.*)">')
 WRAPS_RE = re.compile(r'@wraps\((.*)\)')
 SINCE_RE = re.compile(r'@since\(([^)]*)\)')
 CENTER_RE = re.compile(r'<p align="center">([^<]*)</p>')
@@ -78,9 +78,10 @@ def main(argv: typing.Sequence[str]) -> None:
   for file in argv[1:]: 
     merge_file(file, sys.stdout, wrapper_map)
   if wrapper_map:
-    print("We didn't use all the @wraps()", wrapper_map)
+    print("We didn't use all the @wraps()", wrapper_map, file=sys.stderr)
     sys.exit(1)
+  return 0
 
 
 if __name__ == '__main__':
-  main(sys.argv)
+  sys.exit(main(sys.argv))