Skip to content

Commit b4497fc

Browse files
committed
thread through the version releaselevel and serial
1 parent 55258e1 commit b4497fc

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

python/private/hermetic_runtime_repo_setup.bzl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,12 @@ def define_hermetic_runtime_toolchain_impl(
204204
"major": str(version_info.release[0]),
205205
"micro": str(version_info.release[2]),
206206
"minor": str(version_info.release[1]),
207+
"releaselevel": {
208+
"a": "alpha",
209+
"b": "beta",
210+
"c": "candidate",
211+
}.get(version_info.pre[0]) if version_info.pre else "final",
212+
"serial": str(version_info.pre[1]) if version_info.pre else "0",
207213
},
208214
coverage_tool = select({
209215
# Convert empty string to None

tests/toolchains/transitions/transitions_tests.bzl

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,21 @@ def _impl(ctx):
5656

5757
exec_tools = ctx.toolchains[EXEC_TOOLS_TOOLCHAIN_TYPE].exec_tools
5858
got_version = exec_tools.exec_interpreter[platform_common.ToolchainInfo].py3_runtime.interpreter_version_info
59+
got = "{}.{}.{}".format(
60+
got_version.major,
61+
got_version.minor,
62+
got_version.micro,
63+
)
64+
if got_version.releaselevel != "final":
65+
got = "{}{}{}".format(
66+
got,
67+
got_version.releaselevel[0],
68+
got_version.serial,
69+
)
5970

6071
return [
6172
TestInfo(
62-
got = "{}.{}.{}".format(
63-
got_version.major,
64-
got_version.minor,
65-
got_version.micro,
66-
),
73+
got = got,
6774
want = ctx.attr.want_version,
6875
),
6976
]

0 commit comments

Comments
 (0)