Revert "move the dep parsing to the analysis phase"

This reverts commit 7f99cb7.

Author: aignas

python/private/pypi/generate_whl_library_build_bazel.bzl

@@ -24,10 +24,7 @@ _RENDER = {
     "dependencies": render.list,
     "dependencies_by_platform": lambda x: render.dict(x, value_repr = render.list),
     "entry_points": render.dict,
-    "extras": render.list,
     "group_deps": render.list,
-    "platforms": render.list,
-    "requires_dist": render.list,
     "srcs_exclude": render.list,
     "tags": render.list,
 }

python/private/pypi/whl_library.bzl

@@ -24,6 +24,7 @@ load(":generate_whl_library_build_bazel.bzl", "generate_whl_library_build_bazel"
 load(":parse_requirements.bzl", "host_platform")
 load(":parse_whl_name.bzl", "parse_whl_name")
 load(":patch_whl.bzl", "patch_whl")
+load(":pep508_env.bzl", "deps")
 load(":pypi_repo_utils.bzl", "pypi_repo_utils")
 load(":whl_target_platforms.bzl", "whl_target_platforms")
 
@@ -353,22 +354,13 @@ def _whl_library_impl(rctx):
         )
         entry_points[entry_point_without_py] = entry_point_script_name
 
-    build_file_contents = generate_whl_library_build_bazel(
-        whl_name = whl_path.basename,
-        # TODO @aignas 2025-03-23: load the dep_template from the hub repository
-        dep_template = rctx.attr.dep_template or "@{}{{name}}//:{{target}}".format(rctx.attr.repo_prefix),
-        # TODO @aignas 2025-03-23: store the `group_name` per package in the hub repo
-        group_name = rctx.attr.group_name,
-        group_deps = rctx.attr.group_deps,
-        # TODO @aignas 2025-03-23: store the pip_data_exclude in the hub repo.
-        data_exclude = rctx.attr.pip_data_exclude,
-        tags = [
-            "pypi_name=" + metadata["name"],
-            "pypi_version=" + metadata["version"],
-        ],
-        entry_points = entry_points,
-        # TODO @aignas 2025-03-23: store the annotation in the hub repo.
-        annotation = None if not rctx.attr.annotation else struct(**json.decode(rctx.read(rctx.attr.annotation))),
+    # TODO @aignas 2025-02-24: move this to pkg_aliases layer to have this in
+    # the analysis phase. This means that we need to get the target platform abi
+    # from the python version/versions we are setting the package up for. We can
+    # potentially get this from the python toolchain interpreter.
+    package_deps = deps(
+        # TODO @aignas 2025-02-24:  get the data here by parsing the METADATA
+        # file manually without involving python interpreter at all.
         name = metadata["name"],
         requires_dist = metadata["requires_dist"],
         # target the host platform if the target platform is not specified in the rule.
@@ -389,6 +381,28 @@ def _whl_library_impl(rctx):
         # deps. This would be again, internal only stuff.
         host_python_version = metadata["python_version"],
     )
+
+    build_file_contents = generate_whl_library_build_bazel(
+        name = whl_path.basename,
+        # TODO @aignas 2025-03-23: load the dep_template from the hub repository
+        dep_template = rctx.attr.dep_template or "@{}{{name}}//:{{target}}".format(rctx.attr.repo_prefix),
+        # TODO @aignas 2025-03-23: replace `dependencies` and
+        # `dependencies_by_platform` with `requires_dist`.
+        dependencies = package_deps.deps,
+        dependencies_by_platform = package_deps.deps_select,
+        # TODO @aignas 2025-03-23: store the `group_name` per package in the hub repo
+        group_name = rctx.attr.group_name,
+        group_deps = rctx.attr.group_deps,
+        # TODO @aignas 2025-03-23: store the pip_data_exclude in the hub repo.
+        data_exclude = rctx.attr.pip_data_exclude,
+        tags = [
+            "pypi_name=" + metadata["name"],
+            "pypi_version=" + metadata["version"],
+        ],
+        entry_points = entry_points,
+        # TODO @aignas 2025-03-23: store the annotation in the hub repo.
+        annotation = None if not rctx.attr.annotation else struct(**json.decode(rctx.read(rctx.attr.annotation))),
+    )
     rctx.file("BUILD.bazel", build_file_contents)
 
     return

python/private/pypi/whl_library_targets.bzl

@@ -29,12 +29,10 @@ load(
     "WHEEL_FILE_IMPL_LABEL",
     "WHEEL_FILE_PUBLIC_LABEL",
 )
-load(":pep508_env.bzl", "deps")
 
 def whl_library_targets(
         *,
         name,
-        whl_name,
         dep_template,
         data_exclude = [],
         srcs_exclude = [],
@@ -43,16 +41,14 @@ def whl_library_targets(
             DIST_INFO_LABEL: ["site-packages/*.dist-info/**"],
             DATA_LABEL: ["data/**"],
         },
+        dependencies = [],
+        dependencies_by_platform = {},
         group_deps = [],
         group_name = "",
         data = [],
         copy_files = {},
         copy_executables = {},
         entry_points = {},
-        requires_dist = [],
-        platforms,
-        extras = [],
-        host_python_version,
         native = native,
         rules = struct(
             copy_file = copy_file,
@@ -62,12 +58,14 @@ def whl_library_targets(
     """Create all of the whl_library targets.
 
     Args:
-        name: {type}`str` the name of the distribution.
-        whl_name: {type}`str` The file to match for including it into the `whl`
+        name: {type}`str` The file to match for including it into the `whl`
             filegroup. This may be also parsed to generate extra metadata.
         dep_template: {type}`str` The dep_template to use for dependency
             interpolation.
         tags: {type}`list[str]` The tags set on the `py_library`.
+        dependencies: {type}`list[str]` A list of dependencies.
+        dependencies_by_platform: {type}`dict[str, list[str]]` A list of
+            dependencies by platform key.
         filegroups: {type}`dict[str, list[str]]` A dictionary of the target
             names and the glob matches.
         group_name: {type}`str` name of the dependency group (if any) which
@@ -89,29 +87,9 @@ def whl_library_targets(
         data: {type}`list[str]` A list of labels to include as part of the `data` attribute in `py_library`.
         entry_points: {type}`dict[str, str]` The mapping between the script
             name and the python file to use. DEPRECATED.
-        requires_dist: TODO
-        platforms: TODO
-        extras: TODO
-        host_python_version: TODO
         native: {type}`native` The native struct for overriding in tests.
         rules: {type}`struct` A struct with references to rules for creating targets.
     """
-
-    # TODO @aignas 2025-02-24: move this to pkg_aliases layer to have this in
-    # the analysis phase. This means that we need to get the target platform abi
-    # from the python version/versions we are setting the package up for. We can
-    # potentially get this from the python toolchain interpreter.
-    package_deps = deps(
-        name = name,
-        requires_dist = requires_dist,
-        platforms = platforms,
-        extras = extras,
-        host_python_version = host_python_version,
-    )
-
-    dependencies = package_deps.deps
-    dependencies_by_platform = package_deps.deps_select
-
     dependencies = sorted([normalize_name(d) for d in dependencies])
     dependencies_by_platform = {
         platform: sorted([normalize_name(d) for d in deps])
@@ -225,7 +203,7 @@ def whl_library_targets(
     if hasattr(native, "filegroup"):
         native.filegroup(
             name = whl_file_label,
-            srcs = [whl_name],
+            srcs = [name],
             data = _deps(
                 deps = dependencies,
                 deps_by_platform = dependencies_by_platform,