Skip to content

Commit fb88eb9

Browse files
committed
keep compatiblity with WORKSPACE
1 parent b3203ba commit fb88eb9

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

python/private/pypi/parse_requirements.bzl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def parse_requirements(
4040
extra_pip_args = [],
4141
get_index_urls = None,
4242
evaluate_markers = None,
43+
extract_url_srcs = True,
4344
logger = None):
4445
"""Get the requirements with platforms that the requirements apply to.
4546
@@ -58,6 +59,8 @@ def parse_requirements(
5859
the platforms stored as values in the input dict. Returns the same
5960
dict, but with values being platforms that are compatible with the
6061
requirements line.
62+
extract_url_srcs: A boolean to enable extracting URLs from requirement
63+
lines to enable using bazel downloader.
6164
logger: repo_utils.logger or None, a simple struct to log diagnostic messages.
6265
6366
Returns:
@@ -206,7 +209,7 @@ def parse_requirements(
206209
ret_requirements.append(
207210
struct(
208211
distribution = r.distribution,
209-
line = r.srcs.requirement if whls or sdist else r.srcs.requirement_line,
212+
line = r.srcs.requirement if extract_url_srcs and (whls or sdist) else r.srcs.requirement_line,
210213
target_platforms = sorted(target_platforms),
211214
extra_pip_args = r.extra_pip_args,
212215
whls = whls,

python/private/pypi/pip_repository.bzl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,20 @@ def _pip_repository_impl(rctx):
8989
python_interpreter_target = rctx.attr.python_interpreter_target,
9090
srcs = rctx.attr._evaluate_markers_srcs,
9191
),
92+
extract_url_srcs = False,
9293
)
9394
selected_requirements = {}
9495
options = None
9596
repository_platform = host_platform(rctx)
9697
for name, requirements in requirements_by_platform.items():
97-
r = select_requirement(
98+
requirement = select_requirement(
9899
requirements,
99100
platform = None if rctx.attr.download_only else repository_platform,
100101
)
101-
if not r:
102+
if not requirement:
102103
continue
103-
options = options or r.extra_pip_args
104-
selected_requirements[name] = r.srcs.requirement_line
104+
options = options or requirement.extra_pip_args
105+
selected_requirements[name] = requirement.line
105106

106107
bzl_packages = sorted(selected_requirements.keys())
107108

0 commit comments

Comments
 (0)