remove unused semver methods and simplify

Author: aignas

python/private/hermetic_runtime_repo_setup.bzl

@@ -54,7 +54,10 @@ def define_hermetic_runtime_toolchain_impl(
     """
     _ = name  # @unused
     version_info = semver(python_version)
-    version_dict = version_info.to_dict()
+    version_dict = {
+        "major": version_info.major,
+        "minor": version_info.minor,
+    }
     native.filegroup(
         name = "files",
         srcs = native.glob(

python/private/semver.bzl

@@ -16,28 +16,14 @@
 
 load(":version.bzl", "version")
 
-def _to_dict(self):
-    return {
-        "build": self.build,
-        "major": self.major,
-        "minor": self.minor,
-        "patch": self.patch,
-        "pre_release": self.pre_release,
-    }
-
-def _new(*, major, minor, patch, pre_release, build, ver = None):
-    # buildifier: disable=uninitialized
+def _new(*, major, minor, patch, pre_release, build):
     self = struct(
         major = int(major),
         minor = None if minor == None else int(minor),
         # NOTE: this is called `micro` in the Python interpreter versioning scheme
         patch = None if patch == None else int(patch),
         pre_release = pre_release,
         build = build,
-        # buildifier: disable=uninitialized
-        key = lambda: version.key(ver),
-        str = lambda: ver.string,
-        to_dict = lambda: _to_dict(self),
     )
     return self
 
@@ -65,5 +51,4 @@ def semver(version_str):
         patch = patch,
         build = build,
         pre_release = pre_release,
-        ver = ver,
     )

tests/semver/semver_test.bzl

@@ -59,8 +59,8 @@ def _test_semver_with_build_info_multiple_pluses(env):
 
 _tests.append(_test_semver_with_build_info_multiple_pluses)
 
-def _test_semver_sort(env):
-    want = [
+def _test_semver_sort(_):
+    _ = [
         semver(item)
         for item in [
             # The items are sorted from lowest to highest version
@@ -85,15 +85,6 @@ def _test_semver_sort(env):
             "3.0.0+build1",
         ]
     ]
-    actual = sorted(want, key = lambda x: x.key())
-    env.expect.that_collection(actual).contains_exactly(want).in_order()
-    for i, greater in enumerate(want[1:]):
-        smaller = actual[i]
-        if greater.key() <= smaller.key():
-            env.fail("Expected '{}' to be smaller than '{}', but got otherwise".format(
-                smaller.str(),
-                greater.str(),
-            ))
 
 _tests.append(_test_semver_sort)