simplify the code

Author: aignas

python/private/pypi/select_whl.bzl

@@ -50,58 +50,33 @@ def select_whl(*, whls, python_version, platforms, want_abis, implementation = "
     for whl in whls:
         parsed = parse_whl_name(whl.filename)
 
-        suffix = ""
-        if parsed.abi_tag.startswith(implementation):
-            v = parsed.abi_tag[2:]
-            min_whl_py_version = version.parse(
-                "{}.{}".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"
-
-            if not version.is_eq(py_version, min_whl_py_version):
-                if logger:
-                    logger.debug(lambda: "Discarding the wheel ('{}') because the min version supported based on the wheel ABI tag '{}' ({}) is not compatible with the provided target Python version '{}'".format(
-                        whl.filename,
-                        parsed.abi_tag,
-                        min_whl_py_version.string,
-                        py_version.string,
-                    ))
-                continue
+        if parsed.python_tag.startswith("py"):
+            pass
+        elif not parsed.python_tag.startswith(implementation):
+            if logger:
+                logger.debug(lambda: "Discarding the wheel because the implementation '{}' is not compatible with target implementation '{}'".format(
+                    parsed.python_tag,
+                    implementation,
+                ))
+            continue
+
+        if parsed.python_tag == "py2.py3":
+            min_version = "2"
         else:
-            if parsed.python_tag.startswith("py"):
-                pass
-            elif not parsed.python_tag.startswith(implementation):
-                if logger:
-                    logger.debug(lambda: "Discarding the wheel because the implementation '{}' is not compatible with target implementation '{}'".format(
-                        parsed.python_tag,
-                        implementation,
-                    ))
-                continue
-
-            if parsed.python_tag == "py2.py3":
-                min_version = "2"
-            else:
-                min_version = parsed.python_tag[2:]
-
-            if len(min_version) > 1:
-                min_version = "{}.{}".format(min_version[0], min_version[1:])
-
-            min_whl_py_version = version.parse(min_version, strict = True)
-            if not version.is_ge(py_version, min_whl_py_version):
-                if logger:
-                    logger.debug(lambda: "Discarding the wheel because the min version supported based on the wheel ABI tag '{}' ({}) is not compatible with the provided target Python version '{}'".format(
-                        parsed.abi_tag,
-                        min_whl_py_version.string,
-                        py_version.string,
-                    ))
-                continue
+            min_version = parsed.python_tag[2:]
+
+        if len(min_version) > 1:
+            min_version = "{}.{}".format(min_version[0], min_version[1:])
+
+        min_whl_py_version = version.parse(min_version, strict = True)
+        if not version.is_ge(py_version, min_whl_py_version):
+            if logger:
+                logger.debug(lambda: "Discarding the wheel because the min version supported based on the wheel ABI tag '{}' ({}) is not compatible with the provided target Python version '{}'".format(
+                    parsed.abi_tag,
+                    min_whl_py_version.string,
+                    py_version.string,
+                ))
+            continue
 
         abi_priority = _get_priority(
             tag = parsed.abi_tag,
@@ -134,7 +109,6 @@ def select_whl(*, whls, python_version, platforms, want_abis, implementation = "
             # prefer abi_tags in this order
             version.key(min_whl_py_version),
             abi_priority,
-            suffix,
         )
         candidates.setdefault(key, whl)