wip

Author: aignas

examples/bzlmod/MODULE.bazel.lock

@@ -368,11 +368,9 @@ def _create_whl_repos(
             target_platforms = requirement.target_platforms if len(requirements) > 1 else []
             repo_name = pypi_repo_name(
                 pip_name,
-                requirement.srcs.requirement,
-                requirement.srcs.version,
-                # Strip the leading cp3x prefix
-                "_".join([p.partition("_")[-1] for p in target_platforms]),
-            ) if target_platforms else "{}_{}".format(pip_name, whl_name)
+                whl_name,
+                *target_platforms
+            )
             whl_libraries[repo_name] = args
             whl_map.setdefault(whl_name, []).append(
                 whl_alias(

python/private/pypi/extension.bzl

@@ -51,28 +51,21 @@ def whl_repo_name(prefix, filename, sha256):
 
     return "_".join(parts)
 
-def pypi_repo_name(prefix, requirement, version, platform_suffix = ""):
+def pypi_repo_name(prefix, whl_name, *target_platforms):
     """Return a valid whl_library given a requirement line.
 
     Args:
         prefix: {type}`str` the prefix of the whl_library.
-        requirement: {type}`str` the requirement to extract the name.
-        version: {type}`str` the requirement to extract the name.
-        platform_suffix: {type}`str` the platform to use in the name.
+        whl_name: {type}`str` the whl_name to use.
+        *target_platforms: {type}`list[str]` the target platforms to use in the name.
 
     Returns:
         {type}`str` that can be used in {obj}`whl_library`.
     """
-    suffix, _, _ = requirement.partition("=")
-    suffix, _, _ = suffix.partition("]")
-    suffix = normalize_name(suffix.replace("[", "_").replace(",", "_"))
-    version = version.replace("-", "_").replace("+", "_").replace(".", "_")
     parts = [
         prefix,
-        normalize_name(suffix),
-        "v" + version,
+        normalize_name(whl_name),
     ]
-    if platform_suffix:
-        parts.append(platform_suffix)
+    parts.extend([p.partition("_")[-1] for p in target_platforms])
 
     return "_".join(parts)

python/private/pypi/whl_repo_name.bzl

@@ -81,6 +81,7 @@ def _parse(
         experimental_index_url = "",
         experimental_requirement_cycles = {},
         experimental_target_platforms = [],
+        extra_hub_aliases = {},
         extra_pip_args = [],
         isolated = True,
         netrc = None,
@@ -107,6 +108,7 @@ def _parse(
         experimental_index_url = experimental_index_url,
         experimental_requirement_cycles = experimental_requirement_cycles,
         experimental_target_platforms = experimental_target_platforms,
+        extra_hub_aliases = extra_hub_aliases,
         extra_pip_args = extra_pip_args,
         hub_name = hub_name,
         isolated = isolated,
@@ -210,7 +212,7 @@ def _test_simple_multiple_requirements(env):
             struct(
                 config_setting = "//_config:is_python_3.15",
                 filename = None,
-                repo = "pypi_315_simple_v0_0_1_windows_x86_64",
+                repo = "pypi_315_simple_windows_x86_64",
                 target_platforms = [
                     "cp315_windows_x86_64",
                 ],
@@ -219,7 +221,7 @@ def _test_simple_multiple_requirements(env):
             struct(
                 config_setting = "//_config:is_python_3.15",
                 filename = None,
-                repo = "pypi_315_simple_v0_0_2_osx_aarch64_osx_x86_64",
+                repo = "pypi_315_simple_osx_aarch64_osx_x86_64",
                 target_platforms = [
                     "cp315_osx_aarch64",
                     "cp315_osx_x86_64",
@@ -229,17 +231,17 @@ def _test_simple_multiple_requirements(env):
         ],
     }})
     pypi.whl_libraries().contains_exactly({
-        "pypi_315_simple_v0_0_1_windows_x86_64": {
+        "pypi_315_simple_osx_aarch64_osx_x86_64": {
             "dep_template": "@pypi//{name}:{target}",
             "python_interpreter_target": "unit_test_interpreter_target",
             "repo": "pypi_315",
-            "requirement": "simple==0.0.1 --hash=sha256:deadbeef",
+            "requirement": "simple==0.0.2 --hash=sha256:deadb00f",
         },
-        "pypi_315_simple_v0_0_2_osx_aarch64_osx_x86_64": {
+        "pypi_315_simple_windows_x86_64": {
             "dep_template": "@pypi//{name}:{target}",
             "python_interpreter_target": "unit_test_interpreter_target",
             "repo": "pypi_315",
-            "requirement": "simple==0.0.2 --hash=sha256:deadb00f",
+            "requirement": "simple==0.0.1 --hash=sha256:deadbeef",
         },
     })
     pypi.whl_mods().contains_exactly({})
@@ -306,14 +308,14 @@ simple==0.0.3 --hash=sha256:deadbaaf
             struct(
                 config_setting = "//_config:is_python_3.15",
                 filename = None,
-                repo = "pypi_315_simple_v0_0_1_linux_x86_64",
+                repo = "pypi_315_simple_linux_x86_64",
                 target_platforms = ["cp315_linux_x86_64"],
                 version = "3.15",
             ),
             struct(
                 config_setting = "//_config:is_python_3.15",
                 filename = None,
-                repo = "pypi_315_simple_v0_0_3_osx_aarch64",
+                repo = "pypi_315_simple_osx_aarch64",
                 target_platforms = ["cp315_osx_aarch64"],
                 version = "3.15",
             ),
@@ -329,7 +331,7 @@ simple==0.0.3 --hash=sha256:deadbaaf
             "repo": "pypi_315",
             "requirement": "extra==0.0.1 --hash=sha256:deadb00f",
         },
-        "pypi_315_simple_v0_0_1_linux_x86_64": {
+        "pypi_315_simple_linux_x86_64": {
             "dep_template": "@pypi//{name}:{target}",
             "download_only": True,
             "experimental_target_platforms": ["cp315_linux_x86_64"],
@@ -338,7 +340,7 @@ simple==0.0.3 --hash=sha256:deadbaaf
             "repo": "pypi_315",
             "requirement": "simple==0.0.1 --hash=sha256:deadbeef",
         },
-        "pypi_315_simple_v0_0_3_osx_aarch64": {
+        "pypi_315_simple_osx_aarch64": {
             "dep_template": "@pypi//{name}:{target}",
             "download_only": True,
             "experimental_target_platforms": ["cp315_osx_aarch64"],