wip

aignas · aignas · commit a91a14711e6c · 2025-10-02T20:49:52.000+09:00
diff --git a/examples/pip_parse_vendored/requirements.bzl b/examples/pip_parse_vendored/requirements.bzl
@@ -4,7 +4,7 @@
 """
 
 load("@rules_python//python:pip.bzl", "pip_utils")
-load("@rules_python//python/pip_install:pip_repository.bzl", "group_library", "whl_library")
+load("@rules_python//python/pip_install:pip_repository.bzl", "group_library", "whl_config_repository", "whl_library")
 
 all_requirements = [
     "@my_project_pip_deps_vendored_certifi//:pkg",
@@ -32,8 +32,6 @@ all_data_requirements = [
     "@my_project_pip_deps_vendored_urllib3//:data",
 ]
 
-packages = sorted(all_whl_requirements_by_package)
-
 _packages = [
     ("my_project_pip_deps_vendored_certifi", "certifi==2023.7.22 --hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 --hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"),
     ("my_project_pip_deps_vendored_charset_normalizer", "charset-normalizer==2.1.1 --hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 --hash=sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"),
@@ -100,6 +98,15 @@ def install_deps(**whl_library_kwargs):
         groups = all_requirement_groups,
     )
 
+    config_repo = "my_project_pip_deps_vendored__config"
+    whl_config_repository(
+        name = config_repo,
+        whl_map = {
+            p: ""
+            for p in all_whl_requirements_by_package
+        },
+    )
+
     # Install wheels which may be participants in a group
     whl_config = dict(_config)
     whl_config.update(whl_library_kwargs)
@@ -114,6 +121,6 @@ def install_deps(**whl_library_kwargs):
             group_name = group_name,
             group_deps = group_deps,
             annotation = _get_annotation(requirement),
-            packages = packages,
+            config_load = "@{}//:config.bzl".format(config_repo),
             **whl_config
         )
diff --git a/python/pip_install/pip_repository.bzl b/python/pip_install/pip_repository.bzl
@@ -17,10 +17,12 @@
 load("//python/private/pypi:group_library.bzl", _group_library = "group_library")
 load("//python/private/pypi:package_annotation.bzl", _package_annotation = "package_annotation")
 load("//python/private/pypi:pip_repository.bzl", _pip_repository = "pip_repository")
+load("//python/private/pypi:whl_config_repository.bzl", _whl_config_repository = "whl_config_repository")
 load("//python/private/pypi:whl_library.bzl", _whl_library = "whl_library")
 
 # Re-exports for backwards compatibility
 group_library = _group_library
 pip_repository = _pip_repository
 whl_library = _whl_library
+whl_config_repository = _whl_config_repository
 package_annotation = _package_annotation
diff --git a/python/private/pypi/config.bzl.tmpl.bzlmod b/python/private/pypi/config.bzl.tmpl.bzlmod
@@ -0,0 +1,9 @@
+"""Extra configuration values that are exposed from the hub repository for spoke repositories to access.
+
+NOTE: This is internal `rules_python` API and if you would like to depend on it, please raise an issue
+with your usecase. This may change in between rules_python versions without any notice.
+
+@generated by rules_python pip.parse bzlmod extension.
+"""
+
+packages = %%PACKAGES%%
diff --git a/python/private/pypi/generate_whl_library_build_bazel.bzl b/python/private/pypi/generate_whl_library_build_bazel.bzl
@@ -83,15 +83,11 @@ def generate_whl_library_build_bazel(
             "target_platforms",
             "default_python_version",
         ]
-        dep_template = kwargs.get("dep_template")
-        packages = kwargs.pop("packages", [])
+        packages_load = kwargs.pop("config_load")
         if not kwargs.get("requires_dist"):
             # no deps, we can leave the extra loads out
             pass
-        elif packages:
-            kwargs["include"] = render.list(packages)
         else:
-            packages_load = dep_template.format(name = "", target = "requirements.bzl")
             loads.append("""load("{}", "{}")""".format(packages_load, "packages"))
             kwargs["include"] = "packages"
 
diff --git a/python/private/pypi/hub_builder.bzl b/python/private/pypi/hub_builder.bzl
@@ -451,6 +451,7 @@ def _common_args(self, module_ctx, *, pip_attr):
     # attrs.
     whl_library_args = dict(
         dep_template = "@{}//{{name}}:{{target}}".format(self.name),
+        config_load = "@{}//:config.bzl".format(self.name),
     )
     maybe_args = dict(
         # The following values are safe to omit if they have false like values
diff --git a/python/private/pypi/hub_repository.bzl b/python/private/pypi/hub_repository.bzl
@@ -46,6 +46,13 @@ def _impl(rctx):
     macro_tmpl = "@@{name}//{{}}:{{}}".format(name = rctx.attr.name)
 
     rctx.file("BUILD.bazel", _BUILD_FILE_CONTENTS)
+    rctx.template(
+        "config.bzl",
+        rctx.attr._config_template,
+        substitutions = {
+            "%%PACKAGES%%": render.dict(rctx.attr.whl_map, value_repr = lambda x: "None"),
+        },
+    )
     rctx.template("requirements.bzl", rctx.attr._requirements_bzl_template, substitutions = {
         "%%ALL_DATA_REQUIREMENTS%%": render.list([
             macro_tmpl.format(p, "data")
@@ -92,6 +99,9 @@ The wheel map where values are json.encoded strings of the whl_map constructed
 in the pip.parse tag class.
 """,
         ),
+        "_config_template": attr.label(
+            default = ":config.bzl.tmpl.bzlmod",
+        ),
         "_requirements_bzl_template": attr.label(
             default = ":requirements.bzl.tmpl.bzlmod",
         ),
diff --git a/python/private/pypi/pip_repository.bzl b/python/private/pypi/pip_repository.bzl
@@ -156,7 +156,7 @@ def _pip_repository_impl(rctx):
     imports = [
         # NOTE: Maintain the order consistent with `buildifier`
         'load("@rules_python//python:pip.bzl", "pip_utils")',
-        'load("@rules_python//python/pip_install:pip_repository.bzl", "group_library", "whl_library")',
+        'load("@rules_python//python/pip_install:pip_repository.bzl", "group_library", "whl_config_repository", "whl_library")',
     ]
 
     annotations = {}
@@ -203,6 +203,13 @@ def _pip_repository_impl(rctx):
 
     rctx.file("BUILD.bazel", _BUILD_FILE_CONTENTS)
     rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
+        "    # %%CONFIG_LIBRARY%%": """\
+    whl_config_library(
+        name = config_repo,
+        whl_map = {
+            p: "" for p in all_whl_requirements_by_package
+        },
+    )""",
         "    # %%GROUP_LIBRARY%%": """\
     group_repo = "{name}__groups"
     group_library(
diff --git a/python/private/pypi/requirements.bzl.tmpl.bzlmod b/python/private/pypi/requirements.bzl.tmpl.bzlmod
@@ -13,8 +13,6 @@ all_whl_requirements = all_whl_requirements_by_package.values()
 
 all_data_requirements = %%ALL_DATA_REQUIREMENTS%%
 
-packages = sorted(all_whl_requirements_by_package)
-
 def requirement(name):
     return "%%MACRO_TMPL%%".format(pip_utils.normalize_name(name), "pkg")
 
diff --git a/python/private/pypi/requirements.bzl.tmpl.workspace b/python/private/pypi/requirements.bzl.tmpl.workspace
@@ -13,8 +13,6 @@ all_whl_requirements = all_whl_requirements_by_package.values()
 
 all_data_requirements = %%ALL_DATA_REQUIREMENTS%%
 
-packages = sorted(all_whl_requirements_by_package)
-
 _packages = %%PACKAGES%%
 _config = %%CONFIG%%
 _annotations = %%ANNOTATIONS%%
@@ -56,6 +54,15 @@ def install_deps(**whl_library_kwargs):
 
     # %%GROUP_LIBRARY%%
 
+    config_repo = "%%NAME%%__config"
+    whl_config_repository(
+        name = config_repo,
+        whl_map = {
+            p: ""
+            for p in all_whl_requirements_by_package
+        },
+    )
+
     # Install wheels which may be participants in a group
     whl_config = dict(_config)
     whl_config.update(whl_library_kwargs)
@@ -70,6 +77,6 @@ def install_deps(**whl_library_kwargs):
             group_name = group_name,
             group_deps = group_deps,
             annotation = _get_annotation(requirement),
-            packages = packages,
+            config_load = "@{}//:config.bzl".format(config_repo),
             **whl_config
         )
diff --git a/python/private/pypi/whl_config_repository.bzl b/python/private/pypi/whl_config_repository.bzl
@@ -0,0 +1,30 @@
+""
+
+load("//python/private:text_util.bzl", "render")
+
+def _impl(rctx):
+    rctx.file("BUILD.bazel", "")
+    rctx.template(
+        "config.bzl",
+        rctx.attr._config_template,
+        substitutions = {
+            "%%PACKAGES%%": render.dict(rctx.attr.whl_map, value_repr = lambda x: "None"),
+        },
+    )
+
+whl_config_repository = repository_rule(
+    attrs = {
+        "whl_map": attr.string_dict(
+            mandatory = True,
+            doc = """\
+The wheel map where values are json.encoded strings of the whl_map constructed
+in the pip.parse tag class.
+""",
+        ),
+        "_config_template": attr.label(
+            default = ":config.bzl.tmpl.bzlmod",
+        ),
+    },
+    doc = """A rule for WORKSPACE to ensure correct whl_repository configuration. PRIVATE USE ONLY.""",
+    implementation = _impl,
+)
diff --git a/python/private/pypi/whl_library.bzl b/python/private/pypi/whl_library.bzl
@@ -372,7 +372,7 @@ def _whl_library_impl(rctx):
     # NOTE @aignas 2025-09-28: if someone has an old vendored file that does not have the
     # dep_template set or the packages is not set either, we should still not break, best to
     # disable pipstar for that particular case.
-    if rp_config.enable_pipstar and (rctx.attr.dep_template or rctx.attr.packages):
+    if rp_config.enable_pipstar and rctx.attr.config_load:
         pypi_repo_utils.execute_checked(
             rctx,
             op = "whl_library.ExtractWheel({}, {})".format(rctx.attr.name, whl_path),
@@ -428,7 +428,7 @@ def _whl_library_impl(rctx):
             dep_template = rctx.attr.dep_template or "@{}{{name}}//:{{target}}".format(
                 rctx.attr.repo_prefix,
             ),
-            packages = rctx.attr.packages if rctx.attr.repo_prefix else [],
+            config_load = rctx.attr.config_load,
             entry_points = entry_points,
             metadata_name = metadata.name,
             metadata_version = metadata.version,
@@ -578,6 +578,9 @@ whl_library_attrs = dict({
         ),
         allow_files = True,
     ),
+    "config_load": attr.string(
+        doc = "The load location for configuration for pipstar.",
+    ),
     "dep_template": attr.string(
         doc = """
 The dep template to use for referencing the dependencies. It should have `{name}`
@@ -598,9 +601,6 @@ For example if your whl depends on `numpy` and your Python package repo is named
     "group_name": attr.string(
         doc = "Name of the group, if any.",
     ),
-    "packages": attr.string_list(
-        doc = "The list of packages to include in the transitive dependencies. This may be used in workspace where one may vendor the requirements.bzl file.",
-    ),
     "repo": attr.string(
         doc = "Pointer to parent repo name. Used to make these rules rerun if the parent repo changes.",
     ),

Original file line number	Diff line number	Diff line change
`@@ -451,6 +451,7 @@ def _common_args(self, module_ctx, *, pip_attr):`
`451`	`451`	`# attrs.`
`452`	`452`	`whl_library_args = dict(`
`453`	`453`	`dep_template = "@{}//{{name}}:{{target}}".format(self.name),`
	`454`	`+ config_load = "@{}//:config.bzl".format(self.name),`
`454`	`455`	`)`
`455`	`456`	`maybe_args = dict(`
`456`	`457`	`# The following values are safe to omit if they have false like values`