Merge branch 'sys.py.win.venv' of https://github.com/rickeylev/rules_python into sys.py.win.venv

Author: rickeylev

python/private/py_executable_info.bzl

@@ -77,6 +77,14 @@ implementation isn't being used.
 
 :::{versionadded} 1.9.0
 :::
+""",
+        "venv_interpreter_runfiles": """
+:type: runfiles | None
+
+Runfiles that are specific to the interpreter within the venv.
+
+:::{versionadded} VERSION_NEXT_FEATURE
+:::
 """,
         "venv_python_exe": """
 :type: File | None
@@ -87,13 +95,5 @@ mode is not enabled.
 :::{versionadded} 1.9.0
 :::
 """,
-        "venv_interpreter_runfiles": """
-:type: runfiles | None
-
-Runfiles that are specific to the interpreter within the venv.
-
-:::{versionadded} VERSION_NEXT_FEATURE
-:::
-"""
     },
 )

python/private/zipapp/zip_main_template.py

@@ -22,13 +22,12 @@
 del sys.path[0]
 
 import os
-from os.path import dirname, join
 import shutil
 import stat
 import subprocess
 import tempfile
 import zipfile
-from os.path import dirname, join, basename
+from os.path import basename, dirname, join
 
 # runfiles-root-relative path
 _STAGE2_BOOTSTRAP = "%stage2_bootstrap%"
@@ -53,6 +52,7 @@
 # backslashes to be properly understood by Windows APIs.
 if IS_WINDOWS:
     from os.path import normpath
+
     _STAGE2_BOOTSTRAP = normpath(_STAGE2_BOOTSTRAP)
     if _PYTHON_BINARY_VENV:
         _PYTHON_BINARY_VENV = normpath(_PYTHON_BINARY_VENV)
@@ -61,6 +61,7 @@
     if EXTRACT_ROOT:
         EXTRACT_ROOT = normpath(EXTRACT_ROOT)
 
+
 def print_verbose(*args, mapping=None, values=None):
     if not bool(os.environ.get("RULES_PYTHON_BOOTSTRAP_VERBOSE")):
         return
@@ -86,7 +87,6 @@ def print_verbose(*args, mapping=None, values=None):
         print("bootstrap: stage 1:", *args, file=sys.stderr, flush=True)
 
 
-
 def get_windows_path_with_unc_prefix(path):
     """Adds UNC prefix after getting a normalized absolute Windows path.
 
@@ -308,6 +308,7 @@ def finish_venv_setup(runfiles_root):
 
     return python_program
 
+
 def main():
     print_verbose("running zip main bootstrap")
     print_verbose("initial argv:", values=sys.argv)

tests/repl/repl_test.py

@@ -23,6 +23,7 @@
 
 IS_WINDOWS = os.name == "nt"
 
+
 class ReplTest(unittest.TestCase):
     def setUp(self):
         rpath = "rules_python/python/bin/repl"
@@ -35,7 +36,7 @@ def setUp(self):
 
     def run_code_in_repl(self, lines: Iterable[str], *, env=None) -> str:
         """Runs the lines of code in the REPL and returns the text output."""
-        input="\n".join(lines)
+        input = "\n".join(lines)
         try:
             return subprocess.check_output(
                 [self.repl],
@@ -48,14 +49,17 @@ def run_code_in_repl(self, lines: Iterable[str], *, env=None) -> str:
             raise RuntimeError(f"Failed to run the REPL:\n{error.stdout}") from error
         except Exception as exc:
             if env:
-                env_str = "\n".join(f"{key}={value!r}" for key, value in sorted(env.items()))
+                env_str = "\n".join(
+                    f"{key}={value!r}" for key, value in sorted(env.items())
+                )
             else:
                 env_str = "<inherited env>"
             if isinstance(exc, subprocess.CalledProcessError):
                 stdout = exc.stdout
             else:
                 stdout = "<unknown>"
-            exc.add_note(f"""
+            exc.add_note(
+                f"""
 ===== env start =====
 {env_str}
 ===== env end =====
@@ -66,7 +70,8 @@ def run_code_in_repl(self, lines: Iterable[str], *, env=None) -> str:
 ===== stdout start =====
 {stdout}
 ===== stdout end =====
-""")
+"""
+            )
             raise
 
     def test_repl_version(self):