Skip to content

Commit 6a8913c

Browse files
committed
refactor: pass the minimum set of attrs to _create_whl_repos
1 parent db0530e commit 6a8913c

File tree

2 files changed

+35
-14
lines changed

2 files changed

+35
-14
lines changed

examples/bzlmod/MODULE.bazel.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python/private/pypi/extension.bzl

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,7 @@ def _create_whl_repos(
133133

134134
requirements_by_platform = parse_requirements(
135135
module_ctx,
136-
requirements_by_platform = requirements_files_by_platform(
137-
requirements_by_platform = pip_attr.requirements_by_platform,
138-
requirements_linux = pip_attr.requirements_linux,
139-
requirements_lock = pip_attr.requirements_lock,
140-
requirements_osx = pip_attr.requirements_darwin,
141-
requirements_windows = pip_attr.requirements_windows,
142-
extra_pip_args = pip_attr.extra_pip_args,
143-
python_version = major_minor,
144-
logger = logger,
145-
),
136+
requirements_by_platform = pip_attr.requirements_by_platform,
146137
extra_pip_args = pip_attr.extra_pip_args,
147138
get_index_urls = get_index_urls,
148139
# NOTE @aignas 2024-08-02: , we will execute any interpreter that we find either
@@ -164,7 +155,7 @@ def _create_whl_repos(
164155
requirements = requirements,
165156
python_interpreter = pip_attr.python_interpreter,
166157
python_interpreter_target = python_interpreter_target,
167-
srcs = pip_attr._evaluate_markers_srcs,
158+
srcs = pip_attr.evaluate_markers_srcs,
168159
logger = logger,
169160
),
170161
logger = logger,
@@ -470,7 +461,37 @@ You cannot use both the additive_build_content and additive_build_content_file a
470461

471462
result = _create_whl_repos(
472463
module_ctx,
473-
pip_attr = pip_attr,
464+
pip_attr = struct(
465+
requirements_by_platform = requirements_files_by_platform(
466+
requirements_by_platform = pip_attr.requirements_by_platform,
467+
requirements_linux = pip_attr.requirements_linux,
468+
requirements_lock = pip_attr.requirements_lock,
469+
requirements_osx = pip_attr.requirements_darwin,
470+
requirements_windows = pip_attr.requirements_windows,
471+
extra_pip_args = pip_attr.extra_pip_args,
472+
python_version = _major_minor_version(pip_attr.python_version),
473+
logger = repo_utils.logger(module_ctx, "pypi:requirements_files_by_platform"),
474+
),
475+
auth_patterns = pip_attr.auth_patterns,
476+
download_only = pip_attr.download_only,
477+
enable_implicit_namespace_pkgs = pip_attr.enable_implicit_namespace_pkgs,
478+
environment = pip_attr.environment,
479+
envsubst = pip_attr.envsubst,
480+
experimental_requirement_cycles = pip_attr.experimental_requirement_cycles,
481+
experimental_target_platforms = pip_attr.experimental_target_platforms,
482+
extra_pip_args = pip_attr.extra_pip_args,
483+
hub_name = pip_attr.hub_name,
484+
isolated = pip_attr.isolated,
485+
netrc = pip_attr.netrc,
486+
pip_data_exclude = pip_attr.pip_data_exclude,
487+
python_interpreter = pip_attr.python_interpreter,
488+
python_interpreter_target = pip_attr.python_interpreter_target,
489+
python_version = pip_attr.python_version,
490+
quiet = pip_attr.quiet,
491+
timeout = pip_attr.timeout,
492+
whl_modifications = pip_attr.whl_modifications,
493+
evaluate_markers_srcs = pip_attr._evaluate_markers_srcs,
494+
),
474495
whl_overrides = whl_overrides,
475496
get_index_urls = get_index_urls,
476497
)

0 commit comments

Comments
 (0)