format

Author: rickeylev

python/private/py_executable.bzl

@@ -81,10 +81,10 @@ This is only needed on Windows, where Bazel doesn't preserve declare_symlink
 with relative paths.
 """,
     fields = {
+        "link_to": "Path the symlink should point to",
         "rf_path": "runfile-root-relative path for the link",
         "venv_rel_path": "venv-root-relative path for the link",
-        "link_to": "Path the symlink should point to"
-    }
+    },
 )
 
 # Non-Google-specific attributes for executables
@@ -754,11 +754,11 @@ def _create_venv_windows(ctx, *, venv_ctx_rel_root, runtime, interpreter_actual_
             rf_path = rf_path,
             venv_rel_path = venv_rel_path,
             link_to = relative_path(
-            # dirname is necessary because a relative symlink is relative to
-            # the directory the symlink resides within.
+                # dirname is necessary because a relative symlink is relative to
+                # the directory the symlink resides within.
                 from_ = paths.dirname(rf_path),
                 to = interpreter_actual_path,
-            )
+            ),
         ))
     else:
         interpreter = ctx.actions.declare_symlink("{}/{}".format(venv_bin_ctx_rel_path, py_exe_basename))
@@ -782,7 +782,7 @@ def _create_venv_windows(ctx, *, venv_ctx_rel_root, runtime, interpreter_actual_
                 # the directory the symlink resides within.
                 from_ = paths.dirname(rf_path),
                 to = runfiles_root_path(ctx, f.short_path),
-            )
+            ),
         ))
 
     # See site.py logic: Windows uses a version/build agnostic site-packages path
@@ -806,8 +806,7 @@ def _venv_details(
         bin_dir,
         recreate_venv_at_runtime,
         interpreter_runfiles,
-        interpreter_symlinks,
-):
+        interpreter_symlinks):
     """Helper to create a struct of platform-specific venv details."""
     return struct(
         # File; the `bin/python` executable (or equivalent) within the venv.
@@ -931,8 +930,12 @@ def _create_stage1_bootstrap(
     }
     computed_subs = ctx.actions.template_dict()
     if venv:
-        computed_subs.add_joined("%runtime_venv_symlinks%",
-            venv.interpreter_symlinks, join_with = "\n", map_each = _map_runtime_venv_symlink)
+        computed_subs.add_joined(
+            "%runtime_venv_symlinks%",
+            venv.interpreter_symlinks,
+            join_with = "\n",
+            map_each = _map_runtime_venv_symlink,
+        )
 
     if stage2_bootstrap:
         subs["%stage2_bootstrap%"] = runfiles_root_path(ctx, stage2_bootstrap.short_path)

python/private/zipapp/py_zipapp_rule.bzl

@@ -155,7 +155,7 @@ def _create_zip(ctx, py_runtime, py_executable, stage2_bootstrap):
         zipper_args.add(ctx.attr.compression, format = "--compression=%s")
     zipper_args.add("--runfiles-dir=runfiles")
 
-    zipper_args.add("\\" if is_windows else "/", format="--pathsep=%s")
+    zipper_args.add("\\" if is_windows else "/", format = "--pathsep=%s")
 
     actions_run(
         ctx,

python/private/zipapp/zip_main_template.py

@@ -51,8 +51,10 @@
 # Windows usually transparently rewrites them, but e.g. `\\?\` paths require
 # backslashes to be properly understood by Windows APIs.
 if IS_WINDOWS:
+
     def norm_slashes(s):
-        if not s: return s
+        if not s:
+            return s
         return s.replace("/", "\\")
 
     _STAGE2_BOOTSTRAP = norm_slashes(_STAGE2_BOOTSTRAP)

tools/private/zipapp/zipper.py

@@ -9,9 +9,11 @@
 # S_IFLNK is usually 0o120000
 S_IFLNK = 0o120000
 
+
 def unix_join(*parts):
     return "/".join(parts)
 
+
 def _get_zip_runfiles_path(
     path, workspace_name, legacy_external_runfiles, runfiles_dir
 ):
@@ -95,12 +97,14 @@ def read_manifest(
     entries.sort(key=lambda x: (x[2], 0 if x[0] == "symlink" else 1))
     return entries
 
+
 def path_norm(path, pathsep):
     if pathsep == "/":
         return path.replace("\\", pathsep)
     else:
         return path.replace("/", "\\")
 
+
 def _write_entry(zf, entry, compress_type, seen, pathsep):
     type_, is_symlink_str, zip_path, content_path = entry
     # Normalize slashes, otherwise the `seen` logic doesn't
@@ -133,7 +137,6 @@ def _write_entry(zf, entry, compress_type, seen, pathsep):
         zf.writestr(zi, target)
         return
 
-
     if is_symlink_str == "-1":
         if not os.path.exists(content_path):
             is_symlink_str = "1"
@@ -249,7 +252,8 @@ def main():
         "--runfiles-dir", default="runfiles", help="Name of the runfiles directory"
     )
     parser.add_argument(
-        "--pathsep", default="/",
+        "--pathsep",
+        default="/",
     )
     args = parser.parse_args()
 
@@ -261,7 +265,7 @@ def main():
             workspace_name=args.workspace_name,
             legacy_external_runfiles=args.legacy_external_runfiles == "1",
             runfiles_dir=args.runfiles_dir,
-            pathsep = args.pathsep,
+            pathsep=args.pathsep,
         )
     except Exception as e:
         e.add_note(f"Error creating zip {args.output}")