Skip to content

Commit f63d582

Browse files
committed
revert the exec_tools changes
1 parent 5220b28 commit f63d582

File tree

4 files changed

+3
-15
lines changed

4 files changed

+3
-15
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ Unreleased changes template.
5454
{#v0-0-0-changed}
5555
### Changed
5656
* (toolchain) The `exec` configuration toolchain now has the forwarded
57-
`py3_runtime` field from the `target` configuration toolchain. This is for
58-
increased compatibility with the `RBE` setups where access to the `exec`
57+
`exec_interpreter` now also forwards the `ToolchainInfo` provider. This is
58+
for increased compatibility with the `RBE` setups where access to the `exec`
5959
configuration interpreter is needed.
6060
* (toolchains) Use the latest astrahl-sh toolchain release [20250317] for Python versions:
6161
* 3.9.21

python/private/py_exec_tools_info.bzl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ This does not work correctly in case of RBE, please use exec_runtime instead.
4444
Once https://github.com/bazelbuild/bazel/issues/23620 is resolved this warning
4545
may be removed.
4646
:::
47-
""",
48-
"exec_runtime": """
49-
:type: PyRuntimeInfo | None
50-
51-
The forwarded {obj}`PyRuntimeInfo` field.
52-
53-
:::{versionadded} VERSION_NEXT_FEATURE
54-
:::
5547
""",
5648
"precompiler": """
5749
:type: Target | None

python/private/py_exec_tools_toolchain.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,10 @@ def _py_exec_tools_toolchain_impl(ctx):
2929
if SentinelInfo in ctx.attr.exec_interpreter:
3030
exec_interpreter = None
3131

32-
# Forward the provider fields from the toolchain itself.
33-
exec_runtime = ctx.attr.exec_interpreter[platform_common.ToolchainInfo]
34-
3532
return [
3633
platform_common.ToolchainInfo(
3734
exec_tools = PyExecToolsInfo(
3835
exec_interpreter = exec_interpreter,
39-
exec_runtime = exec_runtime,
4036
precompiler = ctx.attr.precompiler,
4137
),
4238
**extra_kwargs

python/uv/private/lock.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def _lock_impl(ctx):
107107
args.add_all(ctx.attr.args)
108108

109109
exec_tools = ctx.toolchains[EXEC_TOOLS_TOOLCHAIN_TYPE].exec_tools
110-
runtime = exec_tools.exec_runtime.py3_runtime
110+
runtime = exec_tools.exec_interpreter[platform_common.ToolchainInfo].py3_runtime
111111
python = runtime.interpreter or runtime.interpreter_path
112112
python_files = runtime.files
113113
args.add("--python", python)

0 commit comments

Comments
 (0)