Merge branch 'bump-toolchains' into check-script-default

Author: aignas

tests/toolchains/python_toolchain_test.py

@@ -27,18 +27,14 @@ def test_expected_toolchain_matches(self):
         )
         self.assertIn(expected, settings["toolchain_label"], msg)
 
-        if sys.version_info.releaselevel == "final":
-            actual = "{v.major}.{v.minor}.{v.micro}".format(v=sys.version_info)
-        elif sys.version_info.releaselevel in ["beta"]:
-            actual = (
-                "{v.major}.{v.minor}.{v.micro}{v.releaselevel[0]}{v.serial}".format(
-                    v=sys.version_info
-                )
-            )
-        else:
-            raise NotImplementedError(
-                "Unsupported release level, please update the test"
+        actual = "{v.major}.{v.minor}.{v.micro}".format(v=sys.version_info)
+        if sys.version_info.releaselevel != "final":
+            release_prefix = (
+                "rc"
+                if sys.version_info.releaselevel == "candidate"
+                else sys.version_info.releaselevel[0]
             )
+            actual = f"{actual}{release_prefix}{sys.version_info.serial}"
         self.assertEqual(actual, expect_version)
 
 

tests/toolchains/transitions/transitions_tests.bzl

@@ -67,6 +67,12 @@ def _impl(ctx):
             got_version.releaselevel[0],
             got_version.serial,
         )
+    if got_version.releaselevel != "final":
+        got = "{}{}{}".format(
+            got,
+            "rc" if got_version.releaselevel == "candidate" else got_version.releaselevel[0],
+            got_version.serial,
+        )
 
     return [
         TestInfo(