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

Author: rickeylev

python/private/hermetic_runtime_repo_setup.bzl

@@ -243,10 +243,13 @@ 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"],
-                allow_empty = False,
-            ) + native.glob(
-                include = ["*.pdb"],
+                include = [
+                    "*.dll",
+                    # The pdb files just provide debugging information
+                    "*.pdb",
+                ],
+                # This must be true because glob empty-ness is checked
+                # during loading phase, before select() filters it out.
                 allow_empty = True,
             ),
             "//conditions:default": [],

python/private/local_runtime_repo_setup.bzl

@@ -155,11 +155,14 @@ def define_local_runtime_toolchain_impl(
         pyc_tag = "{}-{}{}{}".format(implementation_name, major, minor, abi_flags),
         venv_bin_files = select({
             "@platforms//os:windows": native.glob(
-                include = ["lib/*.dll"],
-                allow_empty = False,
-            ) + native.glob(
-                include = ["lib/*.pdb"],
-                allow_empty=True,
+                include = [
+                    "*.dll",
+                    # The pdb files just provide debugging information
+                    "*.pdb",
+                ],
+                # This must be true because glob empty-ness is checked
+                # during loading phase, before select() filters it out.
+                allow_empty = True,
             ),
             "//conditions:default": [],
         }),

python/private/repo_utils.bzl

@@ -323,7 +323,7 @@ def _which_describe_failure(binary_name, path):
         "{path_str}"
     ).format(
         binary_name = binary_name,
-        path_str = "\n".join(path_parts)
+        path_str = "\n".join(path_parts),
     )
 
 def _mkdir(mrctx, path):