Skip to content

fix: Enable location expansion for sh_py_run_test #2583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2025
Merged

fix: Enable location expansion for sh_py_run_test #2583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions tests/support/sh_py_run_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,14 @@ def _py_reconfig_impl(ctx):
default_info.default_runfiles,
),
),
testing.TestEnvironment(
environment = ctx.attr.env,
),
# Inherit the expanded environment from the inner target.
ctx.attr.target[RunEnvironmentInfo],
]

def _make_reconfig_rule(**kwargs):
attrs = {
"bootstrap_impl": attr.string(),
"build_python_zip": attr.string(default = "auto"),
"env": attr.string_dict(),
"extra_toolchains": attr.string_list(
doc = """
Value for the --extra_toolchains flag.
Expand Down Expand Up @@ -133,7 +131,6 @@ def py_reconfig_test(*, name, **kwargs):
reconfig_kwargs["bootstrap_impl"] = kwargs.pop("bootstrap_impl", None)
reconfig_kwargs["extra_toolchains"] = kwargs.pop("extra_toolchains", None)
reconfig_kwargs["python_version"] = kwargs.pop("python_version", None)
reconfig_kwargs["env"] = kwargs.get("env")
reconfig_kwargs["target_compatible_with"] = kwargs.get("target_compatible_with")

inner_name = "_{}_inner".format(name)
Expand Down Expand Up @@ -172,7 +169,7 @@ def sh_py_run_test(*, name, sh_src, py_src, **kwargs):

py_binary_kwargs = {
key: kwargs.pop(key)
for key in ("imports", "deps")
for key in ("imports", "deps", "env")
if key in kwargs
}

Expand Down