Skip to content

Fix Python interpreter target labels with @@ prefixes. #940

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 23, 2023
Merged

Fix Python interpreter target labels with @@ prefixes. #940

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions python/pip_install/pip_repository.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
""

load("//python:repositories.bzl", "is_standalone_interpreter")
load("//python:repositories.bzl", "get_interpreter_dirname", "is_standalone_interpreter")
load("//python/pip_install:repositories.bzl", "all_requirements")
load("//python/pip_install:requirements_parser.bzl", parse_requirements = "parse")
load("//python/pip_install/private:srcs.bzl", "PIP_INSTALL_PY_SRCS")
Expand Down Expand Up @@ -124,7 +124,7 @@ def _get_toolchain_unix_cflags(rctx):
fail("could not get python version from interpreter (status {}): {}".format(er.return_code, er.stderr))
_python_version = er.stdout
include_path = "{}/include/python{}".format(
rctx.path(Label("@{}//:WORKSPACE".format(rctx.attr.python_interpreter_target.workspace_name))).dirname.realpath,
get_interpreter_dirname(rctx, rctx.attr.python_interpreter_target),
_python_version,
)

Expand Down
15 changes: 14 additions & 1 deletion python/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,19 @@ def py_repositories():

STANDALONE_INTERPRETER_FILENAME = "STANDALONE_INTERPRETER"

def get_interpreter_dirname(rctx, python_interpreter_target):
"""Get a python interpreter target dirname.

Args:
rctx (repository_ctx): The repository rule's context object.
python_interpreter_target (Target): A target representing a python interpreter.

Returns:
str: The Python interpreter directory.
"""

return rctx.path(Label("{}//:WORKSPACE".format(str(python_interpreter_target).split("//")[0]))).dirname

def is_standalone_interpreter(rctx, python_interpreter_target):
"""Query a python interpreter target for whether or not it's a rules_rust provided toolchain

Expand All @@ -61,7 +74,7 @@ def is_standalone_interpreter(rctx, python_interpreter_target):
return rctx.execute([
"ls",
"{}/{}".format(
rctx.path(Label("@{}//:WORKSPACE".format(rctx.attr.python_interpreter_target.workspace_name))).dirname,
get_interpreter_dirname(rctx, python_interpreter_target),
STANDALONE_INTERPRETER_FILENAME,
),
]).return_code == 0
Expand Down