feat(pypi): Add extra_hub_aliases to pip_repository too (bazel-contrib#2426)

gholms · aignas · web-flow · commit d52b964e4cb1 · 2024-11-19T00:56:51.000Z
The extra_hub_aliases feature from bazel-contrib#2369 has bindings in the pip extension for bzlmod users, but not pip_repository for WORKSPACE users. But it _can_ work for either, so this patch moves it to the list of attrs the two share and makes it work with the latter. --------- Co-authored-by: Ignas Anikevicius <240938+aignas@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -71,6 +71,7 @@ Unreleased changes template.
 
 Other changes:
 * (python_repository) Start honoring the `strip_prefix` field for `zstd` archives.
+* (pypi) {bzl:obj}`pip_parse.extra_hub_aliases` now works in WORKSPACE files.
 
 {#v0-0-0-fixed}
 ### Fixed
diff --git a/examples/bzlmod/MODULE.bazel.lock b/examples/bzlmod/MODULE.bazel.lock
diff --git a/python/private/pypi/attrs.bzl b/python/private/pypi/attrs.bzl
@@ -141,6 +141,16 @@ Special values: `host` (for generating deps for the host platform only) and
 NOTE: this is not for cross-compiling Python wheels but rather for parsing the `whl` METADATA correctly.
 """,
     ),
+    "extra_hub_aliases": attr.string_list_dict(
+        doc = """\
+Extra aliases to make for specific wheels in the hub repo. This is useful when
+paired with the {attr}`whl_modifications`.
+
+:::{versionadded} 0.38.0
+:::
+""",
+        mandatory = False,
+    ),
     "extra_pip_args": attr.string_list(
         doc = """Extra arguments to pass on to pip. Must not contain spaces.
 
diff --git a/python/private/pypi/extension.bzl b/python/private/pypi/extension.bzl
@@ -750,16 +750,6 @@ The indexes must support Simple API as described here:
 https://packaging.python.org/en/latest/specifications/simple-repository-api/
 """,
         ),
-        "extra_hub_aliases": attr.string_list_dict(
-            doc = """\
-Extra aliases to make for specific wheels in the hub repo. This is useful when
-paired with the {attr}`whl_modifications`.
-
-:::{versionadded} 0.38.0
-:::
-""",
-            mandatory = False,
-        ),
         "hub_name": attr.string(
             mandatory = True,
             doc = """
diff --git a/python/private/pypi/pip_repository.bzl b/python/private/pypi/pip_repository.bzl
@@ -177,6 +177,7 @@ def _pip_repository_impl(rctx):
             pkg: [whl_alias(repo = rctx.attr.name + "_" + pkg)]
             for pkg in bzl_packages or []
         },
+        extra_hub_aliases = rctx.attr.extra_hub_aliases,
     )
     for path, contents in aliases.items():
         rctx.file(path, contents)

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,7 @@ def _pip_repository_impl(rctx):`
`177`	`177`	`pkg: [whl_alias(repo = rctx.attr.name + "_" + pkg)]`
`178`	`178`	`for pkg in bzl_packages or []`
`179`	`179`	`},`
	`180`	`+ extra_hub_aliases = rctx.attr.extra_hub_aliases,`
`180`	`181`	`)`
`181`	`182`	`for path, contents in aliases.items():`
`182`	`183`	`rctx.file(path, contents)`