harden a little bit

Author: aignas

python/private/bzlmod/pip.bzl

@@ -208,6 +208,7 @@ def _create_whl_repos(module_ctx, pip_attr, whl_map, whl_overrides):
         )
 
         major_minor = _major_minor_version(pip_attr.python_version)
+        default_major_minor = _major_minor_version(DEFAULT_PYTHON_VERSION)
         whl_map[hub_name].setdefault(whl_name, []).append(
             whl_alias(
                 repo = repo_name,
@@ -216,6 +217,14 @@ def _create_whl_repos(module_ctx, pip_attr, whl_map, whl_overrides):
                 config_setting = Label("//python/config_settings:is_python_" + major_minor),
             ),
         )
+        if default_major_minor == major_minor:
+            whl_map[hub_name][whl_name].append(
+                whl_alias(
+                    repo = repo_name,
+                    version = major_minor,
+                    config_setting = "//conditions:default",
+                ),
+            )
 
 def _pip_impl(module_ctx):
     """Implementation of a class tag that creates the pip hub and corresponding pip spoke whl repositories.

python/private/bzlmod/pip_repository.bzl

@@ -31,7 +31,6 @@ def _pip_repository_impl(rctx):
             key: [whl_alias(**v) for v in json.decode(values)]
             for key, values in rctx.attr.whl_map.items()
         },
-        default_version = rctx.attr.default_version,
     )
     for path, contents in aliases.items():
         rctx.file(path, contents)

python/private/render_pkg_aliases.bzl

@@ -68,7 +68,7 @@ def _render_whl_library_alias(
 
     if default:
         # Attempt setting it but continue if already exists
-        selects.setdefault("//conditions:default", default)
+        selects.setdefault(_CONDITIONS_DEFAULT, default)
 
     return render.alias(
         name = name,
@@ -88,13 +88,13 @@ def _render_common_aliases(*, name, aliases, default_version = None):
     if aliases:
         versions = sorted([a.version for a in aliases if a.version])
         has_default = len([a.config_setting for a in aliases if a.config_setting == _CONDITIONS_DEFAULT]) == 1
-        default_version_aliases = [a for a in aliases if a.version == default_version]
+        default_version_aliases = [a for a in aliases if a.version == default_version or a.config_setting == _CONDITIONS_DEFAULT]
         if not has_default and len(default_version_aliases) > 1:
             fail(
                 (
                     "BUG: expected to have a single alias for the default version, but got multiple: '{}'. " +
-                    "Add the 'whl_alias(config_setting = \"//conditions:default\", ...)' setting explicitly."
-                ).format(default_version_aliases),
+                    "Add the 'whl_alias(config_setting = {}, ...)' setting explicitly."
+                ).format(default_version_aliases, repr(_CONDITIONS_DEFAULT)),
             )
 
         if has_default:

tests/pip_hub_repository/render_pkg_aliases/render_pkg_aliases_test.bzl

@@ -164,7 +164,8 @@ def _test_bzlmod_aliases_with_default(env):
     actual = render_pkg_aliases(
         aliases = {
             "bar-baz": [
-                whl_alias(version = "3.2", repo = "pypi_32_bar_baz", config_setting = "//:my_config_setting"),
+                whl_alias(version = "3.2", repo = "pypi_32_bar_baz", config_setting = "//:my_config_setting_32"),
+                whl_alias(version = "3.1", repo = "pypi_31_bar_baz", config_setting = "//:my_config_setting_31"),
                 whl_alias(version = "3.2", repo = "pypi_32_bar_baz", config_setting = "//conditions:default"),
             ],
         },
@@ -183,7 +184,8 @@ alias(
     name = "pkg",
     actual = select(
         {
-            "//:my_config_setting": "@pypi_32_bar_baz//:pkg",
+            "//:my_config_setting_31": "@pypi_31_bar_baz//:pkg",
+            "//:my_config_setting_32": "@pypi_32_bar_baz//:pkg",
             "//conditions:default": "@pypi_32_bar_baz//:pkg",
         },
     ),
@@ -193,7 +195,8 @@ alias(
     name = "whl",
     actual = select(
         {
-            "//:my_config_setting": "@pypi_32_bar_baz//:whl",
+            "//:my_config_setting_31": "@pypi_31_bar_baz//:whl",
+            "//:my_config_setting_32": "@pypi_32_bar_baz//:whl",
             "//conditions:default": "@pypi_32_bar_baz//:whl",
         },
     ),
@@ -203,7 +206,8 @@ alias(
     name = "data",
     actual = select(
         {
-            "//:my_config_setting": "@pypi_32_bar_baz//:data",
+            "//:my_config_setting_31": "@pypi_31_bar_baz//:data",
+            "//:my_config_setting_32": "@pypi_32_bar_baz//:data",
             "//conditions:default": "@pypi_32_bar_baz//:data",
         },
     ),
@@ -213,7 +217,8 @@ alias(
     name = "dist_info",
     actual = select(
         {
-            "//:my_config_setting": "@pypi_32_bar_baz//:dist_info",
+            "//:my_config_setting_31": "@pypi_31_bar_baz//:dist_info",
+            "//:my_config_setting_32": "@pypi_32_bar_baz//:dist_info",
             "//conditions:default": "@pypi_32_bar_baz//:dist_info",
         },
     ),