Add a new file for parsing versions

Author: aignas

python/BUILD.bazel

@@ -93,9 +93,9 @@ bzl_library(
         "//python/private:bzlmod_enabled_bzl",
         "//python/private:py_package.bzl",
         "//python/private:py_wheel_bzl",
-        "//python/private:py_wheel_normalize_pep440.bzl",
         "//python/private:stamp_bzl",
         "//python/private:util_bzl",
+        "//python/private:version.bzl",
         "@bazel_skylib//rules:native_binary",
     ],
 )

python/private/BUILD.bazel

@@ -578,11 +578,6 @@ bzl_library(
     ],
 )
 
-bzl_library(
-    name = "py_wheel_normalize_pep440_bzl",
-    srcs = ["py_wheel_normalize_pep440.bzl"],
-)
-
 bzl_library(
     name = "reexports_bzl",
     srcs = ["reexports.bzl"],
@@ -663,6 +658,11 @@ bzl_library(
     ],
 )
 
+bzl_library(
+    name = "version_bzl",
+    srcs = ["version.bzl"],
+)
+
 bzl_library(
     name = "version_label_bzl",
     srcs = ["version_label.bzl"],
@@ -706,7 +706,7 @@ exports_files(
         "repack_whl.py",
         "py_package.bzl",
         "py_wheel.bzl",
-        "py_wheel_normalize_pep440.bzl",
+        "version.bzl",
         "reexports.bzl",
         "stamp.bzl",
         "util.bzl",

python/private/py_wheel.bzl

@@ -16,8 +16,8 @@
 
 load(":py_info.bzl", "PyInfo")
 load(":py_package.bzl", "py_package_lib")
-load(":py_wheel_normalize_pep440.bzl", "normalize_pep440")
 load(":stamp.bzl", "is_stamping_enabled")
+load(":version.bzl", "normalize_pep440")
 
 PyWheelInfo = provider(
     doc = "Information about a wheel produced by `py_wheel`",

python/private/pypi/BUILD.bazel

@@ -232,7 +232,7 @@ bzl_library(
     srcs = ["pep508_env.bzl"],
     deps = [
         ":pep508_platform_bzl",
-        "//python/private:py_wheel_normalize_pep440_bzl",
+        "//python/private:version_bzl",
     ],
 )
 

python/private/pypi/pep508_evaluate.bzl

@@ -16,10 +16,7 @@
 """
 
 load("//python/private:enum.bzl", "enum")
-load("//python/private:py_wheel_normalize_pep440.bzl", "parse_version")
-
-# TODO @aignas 2025-05-06: this is exposed for tests only
-version = parse_version
+load("//python/private:version.bzl", "version")
 
 # The expression parsing and resolution for the PEP508 is below
 #
@@ -348,20 +345,8 @@ def _env_expr(left, op, right):
 
 def _version_expr(left, op, right):
     """Evaluate a version comparison expression"""
-    if op == "===":
-        # https://peps.python.org/pep-0440/#arbitrary-equality
-        # > simple string equality operations
-        return _env_expr(left, "==", right)
-
-    if left.endswith(".*") and right.endswith(".*"):
-        fail("PEP440: only one of the sides can have '.*' suffix: {} {} {}".format(
-            left,
-            op,
-            right,
-        ))
-
-    _left = parse_version(left)
-    _right = parse_version(right)
+    _left = version(left)
+    _right = version(right)
     if _left == None or _right == None:
         # Per spec, if either can't be normalized to a version, then
         # fallback to simple string comparison. Usually this is `platform_version`

…on/private/py_wheel_normalize_pep440.bzl python/private/version.bzlpython/private/py_wheel_normalize_pep440.bzl renamed to python/private/version.bzl python/private/py_wheel_normalize_pep440.bzl renamed to python/private/version.bzl

@@ -659,7 +659,7 @@ def _version_compatible(left, right):
     # Note, the ~= operator can be also expressed as:
     # >= V.N, == V.*
     head, _, _ = right.norm.partition(".")
-    right_star = parse_version("{}.*".format(head))
+    right_star = version("{}.*".format(head))
     return left.ge(right) and left.eq(right_star)
 
 def _first_non_none(*args):
@@ -764,23 +764,21 @@ def _new_version(*, epoch = 0, release, pre = "", post = "", dev = "", local = "
 
     return self
 
-def parse_version(version, strict = False):
+def version(version_str, strict = False):
     """Parse a PEP4408 compliant version
 
-    TODO @aignas 2025-05-06: where should this go?
-
     See https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode
     and https://peps.python.org/pep-0440/
 
     Args:
-      version: version string to be normalized according to PEP 440.
+      version_str: version string to be normalized according to PEP 440.
       strict: fail if the version is invalid.
 
     Returns:
       string containing the normalized version.
     """
 
-    parser = _new(version.strip(" " if strict else " .*"))  # PEP 440: Leading and Trailing Whitespace and .*
+    parser = _new(version_str.strip(" " if strict else " .*"))  # PEP 440: Leading and Trailing Whitespace and .*
 
     accept(parser, _is("v"), "")  # PEP 440: Preceding v character
 
@@ -799,7 +797,7 @@ def parse_version(version, strict = False):
         parts[p] = parser.context()["norm"]
         parser.context()["norm"] = ""  # Clear out the buffer so that it is easy to separate the fields
 
-    is_prefix = version.endswith(".*")
+    is_prefix = version_str.endswith(".*")
     parts["is_prefix"] = is_prefix
     if is_prefix and (parts["local"] or parts["post"] or parts["dev"] or parts["pre"]):
         if strict:

tests/py_wheel/py_wheel_tests.bzl

@@ -17,7 +17,7 @@ load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite")
 load("@rules_testing//lib:truth.bzl", "matching")
 load("@rules_testing//lib:util.bzl", rt_util = "util")
 load("//python:packaging.bzl", "py_wheel")
-load("//python/private:py_wheel_normalize_pep440.bzl", "normalize_pep440")  # buildifier: disable=bzl-visibility
+load("//python/private:version.bzl", "normalize_pep440")  # buildifier: disable=bzl-visibility
 
 _basic_tests = []
 _tests = []

tests/pypi/pep508/evaluate_tests.bzl

@@ -14,8 +14,9 @@
 """Tests for construction of Python version matching config settings."""
 
 load("@rules_testing//lib:test_suite.bzl", "test_suite")
+load("//python/private:version.bzl", "version")  # buildifier: disable=bzl-visibility
 load("//python/private/pypi:pep508_env.bzl", pep508_env = "env")  # buildifier: disable=bzl-visibility
-load("//python/private/pypi:pep508_evaluate.bzl", "evaluate", "tokenize", "version")  # buildifier: disable=bzl-visibility
+load("//python/private/pypi:pep508_evaluate.bzl", "evaluate", "tokenize")  # buildifier: disable=bzl-visibility
 
 _tests = []