format code

Author: rickeylev

python/private/hermetic_runtime_repo_setup.bzl

@@ -243,11 +243,11 @@ def define_hermetic_runtime_toolchain_impl(
         # On Windows, a symlink-style venv requires supporting .dll files.
         venv_bin_files = select({
             "@platforms//os:windows": native.glob(
-                include=["*.dll", "*.pdb"],
-                allow_empty=True,
+                include = ["*.dll", "*.pdb"],
+                allow_empty = True,
             ),
             "//conditions:default": [],
-        })
+        }),
     )
 
     py_runtime_pair(

python/private/py_executable.bzl

@@ -535,12 +535,16 @@ def _create_venv(ctx, output_prefix, imports, runtime_details, add_runfiles_root
 
     is_windows = target_platform_has_any_constraint(ctx, ctx.attr._windows_constraints)
     if is_windows:
-        venv_details = _create_venv_windows(ctx, venv_root = venv_root,
+        venv_details = _create_venv_windows(
+            ctx,
+            venv_root = venv_root,
             interpreter_actual_path = interpreter_actual_path,
             runtime = runtime,
         )
     else:
-        venv_details = _create_venv_unixy(ctx, venv_root= venv_root,
+        venv_details = _create_venv_unixy(
+            ctx,
+            venv_root = venv_root,
             interpreter_actual_path = interpreter_actual_path,
             runtime = runtime,
         )
@@ -614,6 +618,7 @@ def _create_venv_unixy(ctx, *, venv_root, runtime, interpreter_actual_path):
     interpreter_runfiles = builders.RunfilesBuilder()
     is_bootstrap_script = BootstrapImplFlag.get_value(ctx) == BootstrapImplFlag.SCRIPT
     create_full_venv = True
+
     # The legacy build_python_zip codepath (enabled by default on windows) isn't
     # compatible with full venv.
     # TODO: Use non-build_python_zip codepath for Windows
@@ -736,14 +741,14 @@ def _create_venv_windows(ctx, *, venv_root, runtime, interpreter_actual_path):
         interpreter_runfiles = interpreter_runfiles.build(ctx),
     )
 
-def _venv_details(*,
+def _venv_details(
+        *,
         interpreter,
         pyvenv_cfg,
         venv_site_packages,
         bin_dir,
         recreate_venv_at_runtime,
-        interpreter_runfiles,
-        ):
+        interpreter_runfiles):
     """Helper to create a struct of platform-specific venv details."""
     return struct(
         # File; the `bin/python` executable (or equivalent) within the venv.
@@ -851,7 +856,6 @@ def _create_stage1_bootstrap(
     else:
         resolve_python_binary_at_runtime = "1"
 
-
     subs = {
         "%interpreter_args%": "\n".join(ctx.attr.interpreter_args),
         "%is_zipfile%": "1" if is_for_zip else "0",

python/private/py_runtime_info.bzl

@@ -120,8 +120,8 @@ def _PyRuntimeInfo_init(
         "stage2_bootstrap_template": stage2_bootstrap_template,
         "stub_shebang": stub_shebang,
         "supports_build_time_venv": supports_build_time_venv,
-        "zip_main_template": zip_main_template,
         "venv_bin_files": venv_bin_files,
+        "zip_main_template": zip_main_template,
     }
 
 PyRuntimeInfo, _unused_raw_py_runtime_info_ctor = provider(
@@ -336,6 +336,14 @@ to meet two criteria:
 
 :::{versionadded} 1.5.0
 :::
+""",
+        "venv_bin_files": """
+:type: list[File]
+
+Files that should be added to the venv's `bin/` (or platform-specific equivalent)
+directory (using the file's basename).
+
+:::{versionadded} VERSION_NEXT_FEATURE
 """,
         "zip_main_template": """
 :type: File
@@ -357,14 +365,6 @@ The following substitutions are made during template expansion:
 
 :::{versionadded} 0.33.0
 :::
-""",
-"venv_bin_files": """
-:type: list[File]
-
-Files that should be added to the venv's `bin/` (or platform-specific equivalent)
-directory (using the file's basename).
-
-:::{versionadded} VERSION_NEXT_FEATURE
 """,
     },
 )

python/private/py_runtime_rule.bzl

@@ -361,6 +361,7 @@ See {obj}`PyRuntimeInfo.supports_build_time_venv` for docs.
 """,
                 default = True,
             ),
+            "venv_bin_files": attr.label_list(allow_files = True),
             "zip_main_template": attr.label(
                 default = "//python/private/zipapp:zip_main_template",
                 allow_single_file = True,
@@ -380,7 +381,6 @@ The {obj}`PyRuntimeInfo.zip_main_template` field.
             "_python_version_flag": attr.label(
                 default = labels.PYTHON_VERSION,
             ),
-            "venv_bin_files": attr.label_list(allow_files=True),
         },
     ),
 )

python/private/stage2_bootstrap_template.py

@@ -186,8 +186,8 @@ def find_runfiles_root(main_rel_path):
     # not found. These can be correctly set for a parent Python process, but
     # inherited by the child, and not correct for it. Later bootstrap code
     # assumes they're are correct if set.
-    os.environ.pop('RUNFILES_DIR', None)
-    os.environ.pop('RUNFILES_MANIFEST_FILE', None)
+    os.environ.pop("RUNFILES_DIR", None)
+    os.environ.pop("RUNFILES_MANIFEST_FILE", None)
 
     stub_filename = sys.argv[0]
     if not os.path.isabs(stub_filename):

tests/bootstrap_impls/sys_path_order_test.py

@@ -17,6 +17,7 @@
 import sys
 import unittest
 
+
 class SysPathOrderTest(unittest.TestCase):
     def test_sys_path_order(self):
         last_stdlib = None
@@ -34,7 +35,7 @@ def test_sys_path_order(self):
         for i, value in enumerate(sys.path):
             # On windows, the `pythonXY.zip` entry shows up as `$venv/Scripts/pythonXY.zip`
             # While it's technically part of the venv, it's considered the stdlib.
-            if os.name == 'nt' and re.search("python.*[.]zip$", value):
+            if os.name == "nt" and re.search("python.*[.]zip$", value):
                 category = "stdlib"
             elif value in (sys.prefix, sys.base_prefix):
                 # The runtime's root repo may be added to sys.path, but it

tests/bootstrap_impls/system_python_nodeps_test.py

@@ -1,3 +1,4 @@
 print("Hello, world")
 import pathlib
+
 print(pathlib)