fixes for bazelbuild#1930

CHANGELOG.md

@@ -48,6 +48,8 @@ A brief description of the categories of changes:
   "panic: runtime error: invalid memory address or nil pointer dereference"
 * (bzlmod) remove `pip.parse(annotations)` attribute as it is unused and has been
   replaced by whl_modifications.
+* (pip) Correctly select wheels when the python tag includes minor versions.
+  See ([#1930](https://github.com/bazelbuild/rules_python/issues/1930))
 
 ### Added
 * (rules) Precompiling Python source at build time is available. but is

python/private/whl_target_platforms.bzl

@@ -134,8 +134,8 @@ def select_whls(*, whls, want_version = None, want_abis = [], want_platforms = [
 
         if parsed.platform_tag == "any" or not want_platforms:
             whl_version_min = 0
-            if parsed.python_tag.startswith("cp3"):
-                whl_version_min = int(parsed.python_tag[len("cp3"):])
+            if parsed.python_tag.startswith("cp3") or parsed.python_tag.startswith("py3"):
+                whl_version_min = int(parsed.python_tag[len("xx3"):] or 0)
 
             if version_limit != -1 and whl_version_min > version_limit:
                 continue

tests/private/whl_target_platforms/select_whl_tests.bzl

@@ -68,6 +68,7 @@ WHL_LIST = [
         "pkg-0.0.1-cp39-cp39-win32.whl",
         "pkg-0.0.1-cp39-cp39-win_amd64.whl",
         "pkg-0.0.1-cp39-abi3-any.whl",
+        "pkg-0.0.1-py310-abi3-any.whl",
         "pkg-0.0.1-py3-abi3-any.whl",
         "pkg-0.0.1-py3-none-any.whl",
     ]
@@ -127,6 +128,13 @@ def _test_select_by_supported_py_version(env):
         "pkg-0.0.1-cp39-abi3-any.whl",
     )
 
+    got = select_whls(whls = WHL_LIST, want_abis = ["abi3"], want_platforms = ["ignored"], want_version = "3.10")
+    _match(
+        env,
+        got,
+        "pkg-0.0.1-py310-abi3-any.whl",
+    )
+
 _tests.append(_test_select_by_supported_py_version)
 
 def _test_match_abi_and_not_py_version(env):