fix lints

Signed-off-by: Jack Luar <39641663+luarss@users.noreply.github.com>

Author: luarss

bazel/BUILD

@@ -49,10 +49,10 @@ config_setting(
 filegroup(
     name = "pandoc",
     srcs = select({
-        ":_linux_x86_64": ["@pandoc_linux_amd64//:pandoc"],
         ":_linux_aarch64": ["@pandoc_linux_arm64//:pandoc"],
-        ":_macos_x86_64": ["@pandoc_macos_x86_64//:pandoc"],
+        ":_linux_x86_64": ["@pandoc_linux_amd64//:pandoc"],
         ":_macos_aarch64": ["@pandoc_macos_arm64//:pandoc"],
+        ":_macos_x86_64": ["@pandoc_macos_x86_64//:pandoc"],
     }),
     visibility = ["//visibility:public"],
 )

bazel/man_pages.bzl

@@ -87,15 +87,15 @@ man_pages = rule(
             doc = "Python scripts for man page generation.",
             allow_files = True,
         ),
-        "_pandoc": attr.label(
-            default = "//bazel:pandoc",
-            allow_single_file = True,
-            cfg = "exec",
-        ),
         "_manpages_impl": attr.label(
             default = "//bazel:manpages_impl",
             executable = True,
             cfg = "exec",
         ),
+        "_pandoc": attr.label(
+            default = "//bazel:pandoc",
+            allow_single_file = True,
+            cfg = "exec",
+        ),
     },
 )

bazel/manpages_impl.py

@@ -41,8 +41,9 @@ def _run_pandoc(pandoc, src, dst, to_format):
     )
 
 
-def _process_section(pandoc, md_dir, roff_scratch, html_dir, cat_dir,
-                     section_num, skip_stems=None):
+def _process_section(
+    pandoc, md_dir, roff_scratch, html_dir, cat_dir, section_num, skip_stems=None
+):
     """Convert every .md in *md_dir* to roff, HTML, and cat pages.
 
     Files whose stem (filename without .md) is in *skip_stems* are
@@ -59,11 +60,11 @@ def _process_section(pandoc, md_dir, roff_scratch, html_dir, cat_dir,
         src = os.path.join(md_dir, fname)
         roff = os.path.join(roff_scratch, f"{stem}.{section_num}")
         _run_pandoc(pandoc, src, roff, "man")
-        _run_pandoc(pandoc, roff,
-                    os.path.join(html_dir, f"{stem}.html"), "html")
+        _run_pandoc(pandoc, roff, os.path.join(html_dir, f"{stem}.html"), "html")
         # pandoc plain replaces nroff -man | col -b
-        _run_pandoc(pandoc, roff,
-                    os.path.join(cat_dir, f"{stem}.{section_num}"), "plain")
+        _run_pandoc(
+            pandoc, roff, os.path.join(cat_dir, f"{stem}.{section_num}"), "plain"
+        )
 
 
 def main():
@@ -74,20 +75,30 @@ def main():
     to roff / HTML / cat pages via pandoc.
     """
     p = argparse.ArgumentParser()
-    p.add_argument("--pandoc", required=True,
-                   help="Path to pandoc binary")
-    p.add_argument("--script", action="append", default=[],
-                   help="Python script path (may be repeated)")
-    p.add_argument("--readme", action="append", default=[],
-                   help="module:path pairs for README.md files")
-    p.add_argument("--messages", action="append", default=[],
-                   help="module:path pairs for messages.txt files")
-    p.add_argument("--man1-src", action="append", default=[],
-                   help="man1 source .md files")
-    p.add_argument("--cat-out", required=True,
-                   help="Output directory for cat pages")
-    p.add_argument("--html-out", required=True,
-                   help="Output directory for html pages")
+    p.add_argument("--pandoc", required=True, help="Path to pandoc binary")
+    p.add_argument(
+        "--script",
+        action="append",
+        default=[],
+        help="Python script path (may be repeated)",
+    )
+    p.add_argument(
+        "--readme",
+        action="append",
+        default=[],
+        help="module:path pairs for README.md files",
+    )
+    p.add_argument(
+        "--messages",
+        action="append",
+        default=[],
+        help="module:path pairs for messages.txt files",
+    )
+    p.add_argument(
+        "--man1-src", action="append", default=[], help="man1 source .md files"
+    )
+    p.add_argument("--cat-out", required=True, help="Output directory for cat pages")
+    p.add_argument("--html-out", required=True, help="Output directory for html pages")
     args = p.parse_args()
 
     with tempfile.TemporaryDirectory() as workdir:
@@ -135,16 +146,13 @@ def main():
         # we can skip them when running pandoc (they're module-level READMEs,
         # not individual function man pages).
         readme_stems = {
-            os.path.splitext(f)[0]
-            for f in os.listdir(man2_md)
-            if f.endswith(".md")
+            os.path.splitext(f)[0] for f in os.listdir(man2_md) if f.endswith(".md")
         }
 
         # Run md_roff_compat.py from docs_dir so its relative paths
         # (./md/man2, ../src) resolve correctly.
         subprocess.run(
-            [sys.executable,
-             os.path.join(scripts_dir, "md_roff_compat.py")],
+            [sys.executable, os.path.join(scripts_dir, "md_roff_compat.py")],
             cwd=docs_dir,
             env={**os.environ, "PYTHONPATH": scripts_dir},
             check=True,
@@ -161,7 +169,8 @@ def main():
 
         # man1: straight from source .md files
         _process_section(
-            pandoc, man1_md,
+            pandoc,
+            man1_md,
             os.path.join(roff_scratch, "man1"),
             os.path.join(html_out, "html1"),
             os.path.join(cat_out, "cat1"),
@@ -170,7 +179,8 @@ def main():
 
         # man2: only the per-function files generated by md_roff_compat.py
         _process_section(
-            pandoc, man2_md,
+            pandoc,
+            man2_md,
             os.path.join(roff_scratch, "man2"),
             os.path.join(html_out, "html2"),
             os.path.join(cat_out, "cat2"),
@@ -180,7 +190,8 @@ def main():
 
         # man3: all files written to man3 (messages-derived pages)
         _process_section(
-            pandoc, man3_md,
+            pandoc,
+            man3_md,
             os.path.join(roff_scratch, "man3"),
             os.path.join(html_out, "html3"),
             os.path.join(cat_out, "cat3"),

pyproject.toml

@@ -1,7 +1,3 @@
 [tool.black]
-extend-exclude = '''
-^/third-party/
-'''
-force-exclude = '''
-^/third-party/
-'''
+extend-exclude = '^/third-party/'
+force-exclude = '^/third-party/'