fix it

Author: aignas

python/private/pypi/pep508_deps.bzl

@@ -15,6 +15,7 @@
 """This module is for implementing PEP508 compliant METADATA deps parsing.
 """
 
+load("@pythons_hub//:versions.bzl", "DEFAULT_PYTHON_VERSION")
 load("//python/private:normalize_name.bzl", "normalize_name")
 load(":pep508_env.bzl", "env")
 load(":pep508_evaluate.bzl", "evaluate")
@@ -51,6 +52,7 @@ def deps(name, *, requires_dist, platforms = [], extras = [], excludes = [], hos
     # drop self edges
     excludes = [name] + [normalize_name(x) for x in excludes]
 
+    host_python_version = host_python_version or DEFAULT_PYTHON_VERSION
     platforms = [
         platform_from_str(p, python_version = host_python_version)
         for p in platforms

python/private/pypi/whl_library_targets.bzl

@@ -68,7 +68,7 @@ def whl_library_targets_from_requires(
         name = name,
         python_version = python_version,
         requires_dist = requires_dist,
-        exclude = group_deps,
+        excludes = group_deps,
         extras = extras,
         target_platforms = target_platforms,
     )
@@ -88,12 +88,9 @@ def _parse_requires_dist(
         name,
         python_version,
         requires_dist,
-        exclude,
+        excludes,
         extras,
         target_platforms):
-    # TODO @aignas 2025-04-15: split this function into 2 where we are passing `package_deps` from the first function to the second.
-    #
-    # this will make unit testing of the functions easier
     parsed_whl = parse_whl_name(name)
 
     # NOTE @aignas 2023-12-04: if the wheel is a platform specific wheel, we
@@ -111,9 +108,9 @@ def _parse_requires_dist(
         name = normalize_name(parsed_whl.distribution),
         requires_dist = requires_dist,
         platforms = target_platforms,
-        exclude = exclude,
+        excludes = excludes,
         extras = extras,
-        default_python_version = python_version,
+        host_python_version = python_version,
     )
 
 def whl_library_targets(
@@ -129,6 +126,7 @@ def whl_library_targets(
         },
         dependencies = [],
         dependencies_by_platform = {},
+        group_deps = [],
         group_name = "",
         data = [],
         copy_files = {},
@@ -157,6 +155,10 @@ def whl_library_targets(
             contains this library. If set, this library will behave as a shim
             to group implementation rules which will provide simultaneously
             installed dependencies which would otherwise form a cycle.
+        group_deps: {type}`list[str]` names of fellow members of the group (if
+            any). These will be excluded from generated deps lists so as to avoid
+            direct cycles. These dependencies will be provided at runtime by the
+            group rules which wrap this library and its fellows together.
         copy_executables: {type}`dict[str, str]` The mapping between src and
             dest locations for the targets.
         copy_files: {type}`dict[str, str]` The mapping between src and
@@ -176,6 +178,7 @@ def whl_library_targets(
         platform: sorted([normalize_name(d) for d in deps])
         for platform, deps in dependencies_by_platform.items()
     }
+    tags = sorted(tags)
     data = [] + data
 
     for filegroup_name, glob in filegroups.items():
@@ -204,11 +207,7 @@ def whl_library_targets(
         data.append(dest)
 
     _config_settings(
-        sorted({
-            p: None
-            for platforms in dependencies_by_platform.values()
-            for p in platforms
-        }),
+        dependencies_by_platform.keys(),
         native = native,
         visibility = ["//visibility:private"],
     )
@@ -227,6 +226,25 @@ def whl_library_targets(
             visibility = ["//visibility:public"],
         )
 
+    # Ensure this list is normalized
+    # Note: mapping used as set
+    group_deps = {
+        normalize_name(d): True
+        for d in group_deps
+    }
+
+    dependencies = [
+        d
+        for d in dependencies
+        if d not in group_deps
+    ]
+    dependencies_by_platform = {
+        p: deps
+        for p, deps in dependencies_by_platform.items()
+        for deps in [[d for d in deps if d not in group_deps]]
+        if deps
+    }
+
     # If this library is a member of a group, its public label aliases need to
     # point to the group implementation rule not the implementation rules. We
     # also need to mark the implementation rules as visible to the group
@@ -393,12 +411,22 @@ def _plat_label(plat):
 def _deps(deps, deps_by_platform, tmpl, select = select):
     deps = [tmpl.format(d) for d in sorted(deps)]
 
-    for dep, platforms in deps_by_platform.items():
-        deps += select({
-            "//conditions:default": [],
-        } | {
-            _plat_label(p): [tmpl.format(dep)]
-            for p in platforms
-        })
+    if not deps_by_platform:
+        return deps
 
-    return deps
+    deps_by_platform = {
+        _plat_label(p): [
+            tmpl.format(d)
+            for d in sorted(deps)
+        ]
+        for p, deps in sorted(deps_by_platform.items())
+    }
+
+    # Add the default, which means that we will be just using the dependencies in
+    # `deps` for platforms that are not handled in a special way by the packages
+    deps_by_platform.setdefault("//conditions:default", [])
+
+    if not deps:
+        return select(deps_by_platform)
+    else:
+        return deps + select(deps_by_platform)