pre-commit cleanup

Author: rickeylev

examples/pip_repository_annotations/pip_repository_annotations_test.py

@@ -34,11 +34,7 @@ def wheel_pkg_dir(self) -> str:
 
     def test_build_content_and_data(self):
         r = runfiles.Create()
-        rpath = r.Rlocation(
-            "{}/generated_file.txt".format(
-                self.wheel_pkg_dir()
-            )
-        )
+        rpath = r.Rlocation("{}/generated_file.txt".format(self.wheel_pkg_dir()))
         generated_file = Path(rpath)
         self.assertTrue(generated_file.exists())
 
@@ -47,11 +43,7 @@ def test_build_content_and_data(self):
 
     def test_copy_files(self):
         r = runfiles.Create()
-        rpath = r.Rlocation(
-            "{}/copied_content/file.txt".format(
-                self.wheel_pkg_dir()
-            )
-        )
+        rpath = r.Rlocation("{}/copied_content/file.txt".format(self.wheel_pkg_dir()))
         copied_file = Path(rpath)
         self.assertTrue(copied_file.exists())
 
@@ -113,9 +105,7 @@ def test_extra(self):
         # This test verifies that annotations work correctly for pip packages with extras
         # specified, in this case requests[security].
         r = runfiles.Create()
-        path = "{}/generated_file.txt".format(
-            self.requests_pkg_dir()
-        )
+        path = "{}/generated_file.txt".format(self.requests_pkg_dir())
         rpath = r.Rlocation(path)
         generated_file = Path(rpath)
         self.assertTrue(generated_file.exists())

python/private/py_executable.bzl

@@ -753,9 +753,9 @@ def _create_stage2_bootstrap(
             "%imports%": ":".join(imports.to_list()),
             "%main%": main_py_path,
             "%main_module%": ctx.attr.main_module,
+            "%site_packages%": venv.venv_site_packages if venv else "",
             "%target%": str(ctx.label),
             "%workspace_name%": ctx.workspace_name,
-            "%site_packages%": venv.venv_site_packages if venv else "",
         },
         is_executable = True,
     )
@@ -789,10 +789,10 @@ def _create_stage1_bootstrap(
         "%python_binary%": python_binary_path,
         "%python_binary_actual%": python_binary_actual,
         "%recreate_venv_at_runtime%": str(int(venv.recreate_venv_at_runtime)) if venv else "0",
+        "%resolve_python_binary_at_runtime%": "0" if runtime.supports_build_time_venv else "1",
         "%target%": str(ctx.label),
-        "%workspace_name%": ctx.workspace_name,
         "%venv_rel_site_packages%": venv.venv_site_packages if venv else "",
-        "%resolve_python_binary_at_runtime%": "0" if runtime.supports_build_time_venv else "1",
+        "%workspace_name%": ctx.workspace_name,
     }
 
     if stage2_bootstrap:

python/private/py_runtime_info.bzl

@@ -118,9 +118,9 @@ def _PyRuntimeInfo_init(
         "pyc_tag": pyc_tag,
         "python_version": python_version,
         "site_init_template": site_init_template,
-        "supports_build_time_venv": supports_build_time_venv,
         "stage2_bootstrap_template": stage2_bootstrap_template,
         "stub_shebang": stub_shebang,
+        "supports_build_time_venv": supports_build_time_venv,
         "zip_main_template": zip_main_template,
     }
 
@@ -314,6 +314,26 @@ The following substitutions are made during template expansion:
 "Shebang" expression prepended to the bootstrapping Python stub
 script used when executing {obj}`py_binary` targets.  Does not
 apply to Windows.
+""",
+        "supports_build_time_venv": """
+:type: bool
+
+True if this toolchain supports creating a virtual env at runtime. False if not
+or unknown. If build-time venv creation isn't supported, then binaries may
+fallback to non-venv solutions or creating a venv at runtime.
+
+In order to have a functionalal virtualenv created at build time, two criteria
+must be met:
+1. Specifying that the invoked interpreter (`$venv/bin/python3`, as reported by
+   `sys.executable`) isn't the real interpreter (e.g. `/usr/bin/python3`). This
+   typically requires relative symlinks or support for the `PYTHONEXECUTABLE`
+   environment variable.
+2. Creating a site-packages directory (`sys.prefix`) that the runtime
+   interpreter will recognize (e.g. `$venv/lib/python{version}/site-packages`).
+   This typically requires knowing the Python version at build time.
+
+:::{versionadded} VERSION_NEXT_FEATURE
+:::
 """,
         "zip_main_template": """
 :type: File
@@ -335,26 +355,6 @@ The following substitutions are made during template expansion:
 
 :::{versionadded} 0.33.0
 :::
-""",
-        "supports_build_time_venv": """
-:type: bool
-
-True if this toolchain supports creating a virtual env at runtime. False if not
-or unknown. If build-time venv creation isn't supported, then binaries may
-fallback to non-venv solutions or creating a venv at runtime.
-
-In order to have a functionalal virtualenv created at build time, two criteria
-must be met:
-1. Specifying that the invoked interpreter (`$venv/bin/python3`, as reported by
-   `sys.executable`) isn't the real interpreter (e.g. `/usr/bin/python3`). This
-   typically requires relative symlinks or support for the `PYTHONEXECUTABLE`
-   environment variable.
-2. Creating a site-packages directory (`sys.prefix`) that the runtime
-   interpreter will recognize (e.g. `$venv/lib/python{version}/site-packages`).
-   This typically requires knowing the Python version at build time.
-
-:::{versionadded} VERSION_NEXT_FEATURE
-:::
 """,
     },
 )

python/private/py_runtime_rule.bzl

@@ -308,17 +308,6 @@ from `implementation_name` and `interpreter_version_info`. If no pyc_tag is
 available, then only source-less pyc generation will function correctly.
 """,
             ),
-            "supports_build_time_venv": attr.bool(
-                doc = """
-Whether this runtime supports virtualenvs created at build time.
-
-See {obj}`PyRuntimeInfo.supports_build_time_venv` for docs.
-
-:::{versionadded} VERSION_NEXT_FEATURE
-:::
-""",
-                default = True,
-            ),
             "python_version": attr.string(
                 default = "PY3",
                 values = ["PY2", "PY3"],
@@ -365,6 +354,17 @@ motivation.
 Does not apply to Windows.
 """,
             ),
+            "supports_build_time_venv": attr.bool(
+                doc = """
+Whether this runtime supports virtualenvs created at build time.
+
+See {obj}`PyRuntimeInfo.supports_build_time_venv` for docs.
+
+:::{versionadded} VERSION_NEXT_FEATURE
+:::
+""",
+                default = True,
+            ),
             "zip_main_template": attr.label(
                 default = "//python/private:zip_main_template",
                 allow_single_file = True,

python/private/stage2_bootstrap_template.py

@@ -377,8 +377,11 @@ def main():
         # toolchain configuration. In any case, this better matches how the
         # previous bootstrap=system_python bootstrap worked (using PYTHONPATH,
         # which isn't version-specific).
-        print_verbose(f"sys.path missing expected site-packages: adding {site_packages}")
+        print_verbose(
+            f"sys.path missing expected site-packages: adding {site_packages}"
+        )
         import site
+
         site.addsitedir(site_packages)
 
     main_rel_path = None

tests/runtime_env_toolchain/toolchain_runs_test.py

@@ -5,6 +5,7 @@
 
 from python.runfiles import runfiles
 
+
 class RunTest(unittest.TestCase):
     def test_ran(self):
         rf = runfiles.Create()