chore: also enable pipstar on WORKSPACE

Author: aignas

CHANGELOG.md

@@ -69,8 +69,10 @@ END_UNRELEASED_TEMPLATE
 * (bootstrap) For {obj}`--bootstrap_impl=system_python`, the sys.path order has
   changed from `[app paths, stdlib, runtime site-packages]` to `[stdlib, app
   paths, runtime site-packages]`.
-* (pypi) `pipstar` flag has been flipped to be enabled by default for bzlmod
-  ([#2949](https://github.com/bazel-contrib/rules_python/issues/2949)).
+* (pypi) `pipstar` flag has been flipped to be enabled by default, to turn it
+  off use `RULES_PYTHON_ENABLE_PIPSTAR=0` environment variable. If you do, please
+  add a comment to
+  [#2949](https://github.com/bazel-contrib/rules_python/issues/2949).
 
 {#v0-0-0-fixed}
 ### Fixed

examples/pip_parse_vendored/requirements.bzl

@@ -32,6 +32,8 @@ 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"),
@@ -112,5 +114,6 @@ def install_deps(**whl_library_kwargs):
             group_name = group_name,
             group_deps = group_deps,
             annotation = _get_annotation(requirement),
+            packages = packages,
             **whl_config
         )

python/private/pypi/config.bzl.tmpl.bzlmod

@@ -72,6 +72,7 @@ def generate_whl_library_build_bazel(
             "requires",
             "metadata_name",
             "metadata_version",
+            "packages",
             "include",
         ]
     else:
@@ -83,16 +84,20 @@ def generate_whl_library_build_bazel(
             "default_python_version",
         ]
         dep_template = kwargs.get("dep_template")
-        loads.append(
-            """load("{}", "{}")""".format(
-                dep_template.format(
-                    name = "",
-                    target = "config.bzl",
+        packages = kwargs.pop("packages", [])
+        if packages:
+            kwargs["include"] = render.list(packages)
+        else:
+            loads.append(
+                """load("{}", "{}")""".format(
+                    dep_template.format(
+                        name = "",
+                        target = "requirements.bzl",
+                    ),
+                    "packages",
                 ),
-                "whl_map",
-            ),
-        )
-        kwargs["include"] = "whl_map"
+            )
+            kwargs["include"] = "packages"
 
     for arg in unsupported_args:
         if kwargs.get(arg):

python/private/pypi/generate_whl_library_build_bazel.bzl

@@ -46,13 +46,6 @@ 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 = {
-            "%%WHL_MAP%%": 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")
@@ -99,9 +92,6 @@ 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",
         ),

python/private/pypi/hub_repository.bzl

@@ -13,6 +13,8 @@ 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")
 

python/private/pypi/requirements.bzl.tmpl.bzlmod

@@ -13,6 +13,8 @@ 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%%
@@ -68,5 +70,6 @@ def install_deps(**whl_library_kwargs):
             group_name = group_name,
             group_deps = group_deps,
             annotation = _get_annotation(requirement),
+            packages = packages,
             **whl_config
         )

python/private/pypi/requirements.bzl.tmpl.workspace

@@ -423,6 +423,7 @@ def _whl_library_impl(rctx):
             name = whl_path.basename,
             sdist_filename = sdist_filename,
             dep_template = rctx.attr.dep_template or "@{}{{name}}//:{{target}}".format(rctx.attr.repo_prefix),
+            packages = rctx.attr.packages,
             entry_points = entry_points,
             metadata_name = metadata.name,
             metadata_version = metadata.version,
@@ -592,6 +593,9 @@ 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.",
     ),

python/private/pypi/whl_library.bzl

@@ -85,7 +85,7 @@ _tests.append(_test_all_legacy)
 
 def _test_all(env):
     want = """\
-load("@pypi//:config.bzl", "whl_map")
+load("@pypi//:requirements.bzl", "packages")
 load("@rules_python//python/private/pypi:whl_library_targets.bzl", "whl_library_targets_from_requires")
 
 package(default_visibility = ["//visibility:public"])
@@ -112,7 +112,7 @@ whl_library_targets_from_requires(
         "qux",
     ],
     group_name = "qux",
-    include = whl_map,
+    include = packages,
     name = "foo.whl",
     requires_dist = [
         "foo",
@@ -149,7 +149,7 @@ _tests.append(_test_all)
 
 def _test_all_with_loads(env):
     want = """\
-load("@pypi//:config.bzl", "whl_map")
+load("@pypi//:requirements.bzl", "packages")
 load("@rules_python//python/private/pypi:whl_library_targets.bzl", "whl_library_targets_from_requires")
 
 package(default_visibility = ["//visibility:public"])
@@ -176,7 +176,7 @@ whl_library_targets_from_requires(
         "qux",
     ],
     group_name = "qux",
-    include = whl_map,
+    include = packages,
     name = "foo.whl",
     requires_dist = [
         "foo",