unwind circular dependency

Author: mark-thm

python/glob_excludes.bzl

@@ -0,0 +1,19 @@
+# Copyright 2024 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"Utilities for glob exclusions."
+
+load("//python/private:glob_excludes.bzl", _glob_excludes = "glob_excludes")
+
+glob_excludes = _glob_excludes

python/private/pypi/deps.bzl

@@ -16,7 +16,6 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-load("//python/private:glob_excludes.bzl", "glob_excludes")
 
 _RULE_DEPS = [
     # START: maintained by 'bazel run //tools/private/update_deps:update_pip_deps'
@@ -98,52 +97,31 @@ _RULE_DEPS = [
     # END: maintained by 'bazel run //tools/private/update_deps:update_pip_deps'
 ]
 
-_EXCLUSIONS = [
-    ("**/*.py", None),
-    ("**/*.pyc", None),
-    ("**/*.pyc.*", "During pyc creation, temp files named *.pyc.NNN are created"),
-    ("**/*.dist-info/RECORD", None),
-    ("BUILD", None),
-    ("WORKSPACE", None),
-] + [(e, None) for e in glob_excludes.version_dependent_exclusions()]
-
-def _to_comment(comment):
-    if comment:
-        return "  #" + comment
-    return ""
-
-def _format_exclusions(exclusions, indent_depth):
-    indent = " " * indent_depth
-    return "\n".join([
-        "{indent}\"{excl}\",{comment}".format(
-            indent = indent,
-            excl = excl,
-            comment = _to_comment(comment),
-        )
-        for excl, comment in exclusions
-    ])
-
 _GENERIC_WHEEL = """\
 package(default_visibility = ["//visibility:public"])
 
 load("@rules_python//python:defs.bzl", "py_library")
+load("@rules_python//python:glob_excludes.bzl", "glob_excludes")
 
 py_library(
     name = "lib",
     srcs = glob(["**/*.py"]),
-    data = glob(
-        ["**/*"], 
+    data = glob(["**/*"], exclude=[
         # These entries include those put into user-installed dependencies by
         # data_exclude to avoid non-determinism.
-        exclude=[
-{exclusions}
-        ],
-    ),
+        "**/*.py",
+        "**/*.pyc",
+        "**/*.pyc.*",  # During pyc creation, temp files named *.pyc.NNN are created
+        "**/* *",
+        "**/*.dist-info/RECORD",
+        "BUILD",
+        "WORKSPACE",
+    ] + glob_excludes.version_dependent_exclusions()),
     # This makes this directory a top-level in the python import
     # search path for anything that depends on this.
     imports = ["."],
 )
-""".format(exclusions = _format_exclusions(_EXCLUSIONS, 12))
+"""
 
 # Collate all the repository names so they can be easily consumed
 all_repo_names = [name for (name, _, _) in _RULE_DEPS]