Skip to content

fix(pypi): don't resolve python interpreter when not necessary #3727

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
aignas merged 6 commits into from
Apr 23, 2026
+23 −17
Merged

fix(pypi): don't resolve python interpreter when not necessary #3727

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d59623
fix(pypi): don't resolve python interpreter when not necessary
rickeylev Apr 23, 2026
c369ec3
Merge branch 'main' into fix-pipstar-resolve-py-interpreter
rickeylev Apr 23, 2026
549570d
format
rickeylev Apr 23, 2026
eea66c1
Merge branch 'fix-pipstar-resolve-py-interpreter' of https://github.c…
rickeylev Apr 23, 2026
d43a66b
Update python/private/pypi/whl_library.bzl
aignas Apr 23, 2026
e01b208
fix the attr access
aignas Apr 23, 2026
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
40 changes: 23 additions & 17 deletions python/private/pypi/whl_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,11 @@ def _parse_optional_attrs(rctx, args, extra_pip_args = None):
if rctx.attr.add_libdir_to_library_search_path:
if "LDFLAGS" in env:
fail("Can't set both environment LDFLAGS and add_libdir_to_library_search_path")
command = [pypi_repo_utils.resolve_python_interpreter(rctx), "-c", "import sys ; sys.stdout.write('{}/lib'.format(sys.exec_prefix))"]
command = [
pypi_repo_utils.resolve_python_interpreter(rctx),
"-c",
"import sys ; sys.stdout.write('{}/lib'.format(sys.exec_prefix))",
]
result = rctx.execute(command)
if result.return_code != 0:
fail("Failed to get LDFLAGS path: command: {}, exit code: {}, stdout: {}, stderr: {}".format(command, result.return_code, result.stdout, result.stderr))
Expand Down Expand Up @@ -292,22 +296,11 @@ def _extract_whl_py(rctx, *, python_interpreter, args, whl_path, environment, lo

def _whl_library_impl(rctx):
logger = repo_utils.logger(rctx)
python_interpreter = pypi_repo_utils.resolve_python_interpreter(
rctx,
python_interpreter = rctx.attr.python_interpreter,
python_interpreter_target = rctx.attr.python_interpreter_target,
)
args = [
"-m",
"python.private.pypi.whl_installer.wheel_installer",
"--requirement",
rctx.attr.requirement,
]
extra_pip_args = []
extra_pip_args.extend(rctx.attr.extra_pip_args)

whl_path = None
sdist_filename = None
extra_pip_args = []
extra_pip_args.extend(rctx.attr.extra_pip_args)
if rctx.attr.whl_file:
rctx.watch(rctx.attr.whl_file)
whl_path = rctx.path(rctx.attr.whl_file)
Expand Down Expand Up @@ -352,17 +345,30 @@ def _whl_library_impl(rctx):
# build deps from PyPI (e.g. `flit_core`) if they are missing.
extra_pip_args.extend(["--find-links", "."])

args = _parse_optional_attrs(rctx, args, extra_pip_args)

# also enable pipstar for any whls that are downloaded without `pip`
enable_pipstar = (rp_config.enable_pipstar or whl_path) and rctx.attr.config_load
enable_pipstar_extract = enable_pipstar and rp_config.bazel_8_or_later

# When pipstar is enabled, Python isn't used, so there's no need
# to setup env vars to run Python, unless we need to build an sdist
if enable_pipstar_extract and whl_path:
if enable_pipstar_extract and whl_path and not rctx.attr.whl_patches:
environment = {}
args = []
python_interpreter = None
else:
python_interpreter = pypi_repo_utils.resolve_python_interpreter(
rctx,
python_interpreter = rctx.attr.python_interpreter,
python_interpreter_target = rctx.attr.python_interpreter_target,
)
args = [
"-m",
"python.private.pypi.whl_installer.wheel_installer",
"--requirement",
rctx.attr.requirement,
]
args = _parse_optional_attrs(rctx, args, extra_pip_args)

# Manually construct the PYTHONPATH since we cannot use the toolchain here
environment = _create_repository_execution_environment(rctx, python_interpreter, logger = logger)

Expand Down