Skip to content

Commit 3608207

Browse files
feat: Create all_data_requirements alias (#1292)
Minor change. I am creating a Python virtualenv with Bazel, and having `all_data_requirements` for data dependencies just like `all_requirements` would be very helpful.
1 parent e5d9f10 commit 3608207

File tree

6 files changed

+22
-1
lines changed

6 files changed

+22
-1
lines changed

examples/bzlmod/BUILD.bazel

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# The names @pip and @python_39 are values that are repository
77
# names. Those names are defined in the MODULES.bazel file.
88
load("@bazel_skylib//rules:build_test.bzl", "build_test")
9-
load("@pip//:requirements.bzl", "all_requirements", "all_whl_requirements", "requirement")
9+
load("@pip//:requirements.bzl", "all_data_requirements", "all_requirements", "all_whl_requirements", "requirement")
1010
load("@python_3_9//:defs.bzl", py_test_with_transition = "py_test")
1111
load("@python_versions//3.10:defs.bzl", compile_pip_requirements_3_10 = "compile_pip_requirements")
1212
load("@python_versions//3.9:defs.bzl", compile_pip_requirements_3_9 = "compile_pip_requirements")
@@ -83,6 +83,11 @@ build_test(
8383
targets = all_whl_requirements,
8484
)
8585

86+
build_test(
87+
name = "all_data_requirements",
88+
targets = all_data_requirements,
89+
)
90+
8691
build_test(
8792
name = "all_requirements",
8893
targets = all_requirements,

examples/pip_parse_vendored/requirements.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ all_requirements = ["@pip_certifi//:pkg", "@pip_charset_normalizer//:pkg", "@pip
1111

1212
all_whl_requirements = ["@pip_certifi//:whl", "@pip_charset_normalizer//:whl", "@pip_idna//:whl", "@pip_requests//:whl", "@pip_urllib3//:whl"]
1313

14+
all_data_requirements = ["@pip_certifi//:data", "@pip_charset_normalizer//:data", "@pip_idna//:data", "@pip_requests//:data", "@pip_urllib3//:data"]
15+
1416
_packages = [("pip_certifi", "certifi==2022.12.7 --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"), ("pip_charset_normalizer", "charset-normalizer==2.1.1 --hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 --hash=sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"), ("pip_idna", "idna==3.4 --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"), ("pip_requests", "requests==2.28.1 --hash=sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 --hash=sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"), ("pip_urllib3", "urllib3==1.26.13 --hash=sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc --hash=sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8")]
1517
_config = {"download_only": False, "enable_implicit_namespace_pkgs": False, "environment": {}, "extra_pip_args": [], "isolated": True, "pip_data_exclude": [], "python_interpreter": "python3", "python_interpreter_target": interpreter, "quiet": True, "repo": "pip", "repo_prefix": "pip_", "timeout": 600}
1618
_annotations = {}

python/pip_install/pip_hub_repository_requirements_bzlmod.bzl.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ all_requirements = %%ALL_REQUIREMENTS%%
1111

1212
all_whl_requirements = %%ALL_WHL_REQUIREMENTS%%
1313

14+
all_data_requirements = %%ALL_DATA_REQUIREMENTS%%
15+
1416
def _clean_name(name):
1517
return name.replace("-", "_").replace(".", "_").lower()
1618

python/pip_install/pip_repository.bzl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,10 @@ def _create_pip_repository_bzlmod(rctx, bzl_packages, requirements):
330330

331331
rctx.file("BUILD.bazel", build_contents)
332332
rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
333+
"%%ALL_DATA_REQUIREMENTS%%": _format_repr_list([
334+
macro_tmpl.format(p, "data")
335+
for p in bzl_packages
336+
]),
333337
"%%ALL_REQUIREMENTS%%": _format_repr_list([
334338
macro_tmpl.format(p, p)
335339
for p in bzl_packages
@@ -461,6 +465,10 @@ def _pip_repository_impl(rctx):
461465

462466
rctx.file("BUILD.bazel", _BUILD_FILE_CONTENTS)
463467
rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
468+
"%%ALL_DATA_REQUIREMENTS%%": _format_repr_list([
469+
"@{}//{}:data".format(rctx.attr.name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:data".format(rctx.attr.name, p)
470+
for p in bzl_packages
471+
]),
464472
"%%ALL_REQUIREMENTS%%": _format_repr_list([
465473
"@{}//{}".format(rctx.attr.name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
466474
for p in bzl_packages

python/pip_install/pip_repository_requirements.bzl.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ all_requirements = %%ALL_REQUIREMENTS%%
1010

1111
all_whl_requirements = %%ALL_WHL_REQUIREMENTS%%
1212

13+
all_data_requirements = %%ALL_DATA_REQUIREMENTS%%
14+
1315
_packages = %%PACKAGES%%
1416
_config = %%CONFIG%%
1517
_annotations = %%ANNOTATIONS%%

python/pip_install/pip_repository_requirements_bzlmod.bzl.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ all_requirements = %%ALL_REQUIREMENTS%%
88

99
all_whl_requirements = %%ALL_WHL_REQUIREMENTS%%
1010

11+
all_data_requirements = %%ALL_DATA_REQUIREMENTS%%
12+
1113
def _clean_name(name):
1214
return name.replace("-", "_").replace(".", "_").lower()
1315

0 commit comments

Comments
 (0)