fix examples and add more test cases

Author: aignas

examples/bzlmod/MODULE.bazel

@@ -158,6 +158,23 @@ pip.whl_mods(
 )
 use_repo(pip, "whl_mods_hub")
 
+# Because below we are using `windows_aarch64` platform, we have to define various
+# properties for it.
+pip.default(
+    arch_name = "aarch64",
+    config_settings = [
+        "@platforms//os:windows",
+        "@platforms//cpu:aarch64",
+    ],
+    env = {
+        "platform_version": "0",
+    },
+    os_name = "windows",
+    platform = "windows_aarch64",
+    platform_tags = ["win_amd64"],
+    want_abis = [],  # default to all ABIs
+)
+
 # To fetch pip dependencies, use pip.parse. We can pass in various options,
 # but typically we pass requirements and the Python version. The Python
 # version must have been configured by a corresponding `python.toolchain()`

python/private/pypi/extension.bzl

@@ -392,7 +392,7 @@ def _whl_repo(*, src, whl_library_args, is_multiple_versions, download_only, net
 def _configure(config, *, platform, os_name, arch_name, config_settings, env = {}, want_abis, platform_tags, override = False):
     """Set the value in the config if the value is provided"""
     config.setdefault("platforms", {})
-    if platform:
+    if platform and (os_name or arch_name or config_settings or platform_tags or env):
         if not override and config.get("platforms", {}).get(platform):
             return
 
@@ -429,9 +429,12 @@ def _configure(config, *, platform, os_name, arch_name, config_settings, env = {
     else:
         config["platforms"].pop(platform)
 
-def _create_config(defaults):
-    if defaults["platforms"]:
-        return struct(**defaults)
+def _set_defaults(defaults):
+    """Set defaults that rules_python is operating under.
+
+    Because this code is also tested in unit tests, leaving it in MODULE.bazel would be
+    a little problematic.
+    """
 
     # NOTE: We have this so that it is easier to maintain unit tests assuming certain
     # defaults
@@ -488,22 +491,24 @@ def _create_config(defaults):
             },
         )
 
-    _configure(
-        defaults,
-        arch_name = "x86_64",
-        os_name = "windows",
-        platform = "windows_x86_64",
-        config_settings = [
-            "@platforms//os:windows",
-            "@platforms//cpu:x86_64",
-        ],
-        want_abis = [],
-        platform_tags = ["win_amd64"],
-        env = {
-            "platform_version": "0",
-        },
-    )
-    return struct(**defaults)
+    for cpu, platform_tags in {
+        "x86_64": ["win_amd64"],
+    }.items():
+        _configure(
+            defaults,
+            arch_name = cpu,
+            os_name = "windows",
+            platform = "windows_{}".format(cpu),
+            config_settings = [
+                "@platforms//os:windows",
+                "@platforms//cpu:{}".format(cpu),
+            ],
+            want_abis = [],
+            platform_tags = platform_tags,
+            env = {
+                "platform_version": "0",
+            },
+        )
 
 def parse_modules(
         module_ctx,
@@ -559,6 +564,7 @@ You cannot use both the additive_build_content and additive_build_content_file a
         "enable_pipstar": enable_pipstar,
         "platforms": {},
     }
+    _set_defaults(defaults)
     for mod in module_ctx.modules:
         if not (mod.is_root or mod.name == "rules_python"):
             continue
@@ -582,7 +588,7 @@ You cannot use both the additive_build_content and additive_build_content_file a
                 # * for whl selection - We could also model the `cp313t` freethreaded as separate platforms.
             )
 
-    config = _create_config(defaults)
+    config = struct(**defaults)
 
     # TODO @aignas 2025-06-03: Merge override API with the builder?
     _overriden_whl_set = {}

python/private/pypi/whl_target_platforms.bzl

@@ -94,11 +94,15 @@ def select_whl(*, whls, python_version, platforms, want_abis, implementation = "
         suffix = ""
         if parsed.abi_tag.startswith(implementation):
             v = parsed.abi_tag[2:]
-
             min_whl_py_version = version.parse(
-                "{}.{}".format(v[0], v[1:].strip("tm")),
+                "{}.{}".format(v[0], v[1:].strip("tmu")),
                 strict = False,
             )
+            if not min_whl_py_version:
+                if logger:
+                    logger.warn(lambda: "Discarding the wheel ('{}') because we could not parse the version from the abi tag".format(whl.filename))
+                continue
+
             if parsed.abi_tag.endswith("t"):
                 suffix = "t"
 

tests/pypi/extension/extension_tests.bzl

@@ -1067,6 +1067,18 @@ def _test_pipstar_platforms(env):
                         ("linux", "x86_64"),
                         ("osx", "aarch64"),
                     ]
+                ] + [
+                    _default(platform = name)
+                    for name in [
+                        "linux_x86_64",
+                        "linux_aarch64",
+                        "linux_arm",
+                        "linux_ppc",
+                        "linux_s390x",
+                        "osx_x86_64",
+                        "osx_aarch64",
+                        "windows_x86_64",
+                    ]
                 ],
                 parse = [
                     _parse(

tests/pypi/whl_target_platforms/select_whl_tests.bzl

@@ -70,6 +70,9 @@ WHL_LIST = [
     "pkg-0.0.1-py310-abi3-any.whl",
     "pkg-0.0.1-py3-abi3-any.whl",
     "pkg-0.0.1-py3-none-any.whl",
+    # Extra examples that should be discarded
+    "pkg-0.0.1-py27-cp27mu-win_amd64.whl",
+    "pkg-0.0.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
 ]
 
 def _match(env, got, *want_filenames):