fixup

Author: aignas

python/private/pypi/extension.bzl

@@ -474,8 +474,7 @@ You cannot use both the additive_build_content and additive_build_content_file a
             if whl_name in whl_libraries:
                 existing = whl_libraries[whl_name]
 
-                # TODO @aignas 2026-07-04: stop ignoring the index_url
-                diff = _diff_dict(existing, lib, ignore_keys = {"index_url": True})
+                diff = _diff_dict(existing, lib)
                 if diff:
                     fail("'{}' already in created:\n{}".format(
                         whl_name,
@@ -1251,6 +1250,7 @@ def _diff_dict(first, second, *, ignore_keys = {}):
     Args:
         first: The first dictionary to compare.
         second: The second dictionary to compare.
+        ignore_keys: A set of keys to ignore during comparison.
 
     Returns:
         A dictionary containing the differences, with keys "common", "different",

python/private/pypi/generate_whl_library_build_bazel.bzl

@@ -77,10 +77,26 @@ def generate_whl_library_build_bazel(
     """Generate a BUILD file for an unzipped Wheel
 
     Args:
+        name: The name of the target.
         annotation: The annotation for the build file.
         config_load: {type}`str` The location from where to load the config.
+        copy_executables: A mapping of file paths to executable names.
+        copy_files: A mapping of file paths to file names.
+        data_exclude: A list of files to exclude from data.
+        dep_template: The template for dependencies.
+        enable_implicit_namespace_pkgs: Whether to enable implicit namespace packages.
+        entry_points: A mapping of entry points.
+        extras: A list of extras.
+        group_deps: A list of grouped dependencies.
+        group_name: The name of the group.
+        metadata_name: The name of the package.
+        metadata_version: The version of the package.
+        namespace_package_files: A mapping of namespace package files.
         purl: The purl.
         requires_dist: {type}`list[str]` The list of dependencies from the METADATA file.
+        sdist_filename: The filename of the sdist.
+        srcs_exclude: A list of source files to exclude.
+        visibility: The visibility of the target.
         **kwargs: Extra args serialized to be passed to the
             {obj}`whl_library_targets`.
 
@@ -182,10 +198,20 @@ def generate_whl_library_deps_build_bazel(
         group_deps,
         group_name,
         requires_dist,
-        whl_library,
-        **kwargs):
+        whl_library):
     """Generate a BUILD file for an unzipped Wheel
 
+    Args:
+        name: The name of the target.
+        version: The version of the package.
+        config_load: The location from where to load the config.
+        dep_template: The template for dependencies.
+        entry_points: A mapping of entry points.
+        extras: A list of extras.
+        group_deps: A list of grouped dependencies.
+        group_name: The name of the group.
+        requires_dist: The list of dependencies from the METADATA file.
+        whl_library: The wheel library target.
 
     Returns:
         A complete BUILD file as a string

python/private/pypi/hub_builder.bzl

@@ -90,6 +90,7 @@ def hub_builder(
         # Functions to download according to the config
         # dict[str python_version, callable]
         _get_index_urls = {},
+        _default_index_url = {},
         # Tells whether to use the downloader for a package.
         # dict[str python_version, dict[str package_name, bool use_downloader]]
         _use_downloader = {},
@@ -385,32 +386,33 @@ def _add_library(self, *, repos_dict, name, args):
     repos_dict[name] = args
 
 def _set_get_index_urls(self, mctx, pip_attr):
+    python_version = pip_attr.python_version
+
     # Resolve the index URL through envsubst so the ``$VAR`` / ``${VAR:-default}``
     # form is honored when deciding whether the experimental index-url mode is
     # active. Without this, an unsubstituted template like ``$RULES_PYTHON_PIP_INDEX_URL``
     # is treated as truthy and the mode is forced on, even when the env var
     # would expand to the empty string.
-    default_index_url = envsubst(
+    self._default_index_url[python_version] = envsubst(
         pip_attr.experimental_index_url,
         pip_attr.envsubst,
         mctx.getenv,
     ) or self._config.index_url
     default_extra_index_urls = pip_attr.experimental_extra_index_urls or []
 
-    if not default_index_url:
+    if not self._default_index_url[python_version]:
         # parallel_download is set to True by default, so we are not checking/validating it
         # here
         return False
 
-    python_version = pip_attr.python_version
     self._use_downloader.setdefault(python_version, {}).update({
         normalize_name(s): False
         for s in pip_attr.simpleapi_skip
     })
     self._get_index_urls[python_version] = lambda ctx, distributions, *, index_url = None, extra_index_urls = None: self._simpleapi_download_fn(
         ctx,
         attr = struct(
-            index_url = (index_url or default_index_url).rstrip("/"),
+            index_url = (index_url or self._default_index_url[python_version]).rstrip("/"),
             extra_index_urls = [
                 x.rstrip("/")
                 for x in (extra_index_urls or default_extra_index_urls)
@@ -579,7 +581,13 @@ def _create_whl_repos(
         for src in whl.srcs:
             repo = _whl_repo(
                 src = src,
-                index_url = whl.index_url,
+                index_url = (
+                    whl.index_url or
+                    "{}/{}".format(
+                        self._default_index_url[python_version],
+                        whl.name,
+                    )
+                ).rstrip("/"),
                 whl_library_args = whl_library_args,
                 download_only = pip_attr.download_only,
                 netrc = self._config.netrc or pip_attr.netrc,

python/private/pypi/whl_library_targets.bzl

@@ -146,6 +146,7 @@ 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.
+        aliases: {type}`list[str]` A list of aliases to create for the target.
         src_pkg: TODO
         native: {type}`native` The native struct for overriding in tests.
         rules: {type}`struct` A struct with references to rules for creating targets.