Skip to content

Commit 2f35431

Browse files
committed
Ignas: experimental_ prefix
1 parent 9339db4 commit 2f35431

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

examples/build_file_generation/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pip_parse(
105105

106106
# Requirement groups allow Bazel to tolerate PyPi cycles by putting dependencies
107107
# which are known to form cycles into groups together.
108-
requirement_cycles = {
108+
experimental_requirement_cycles = {
109109
"sphinx": [
110110
"sphinx",
111111
"sphinxcontrib-qthelp",

examples/bzlmod/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ use_repo(pip, "whl_mods_hub")
9090
pip.parse(
9191
hub_name = "pip",
9292
python_version = "3.9",
93-
requirement_cycles = {
93+
experimental_requirement_cycles = {
9494
"sphinx": [
9595
"sphinx",
9696
"sphinxcontrib-qthelp",
@@ -113,7 +113,7 @@ pip.parse(
113113
pip.parse(
114114
hub_name = "pip",
115115
python_version = "3.10",
116-
requirement_cycles = {
116+
experimental_requirement_cycles = {
117117
"sphinx": [
118118
"sphinx",
119119
"sphinxcontrib-qthelp",

examples/pip_parse/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pip_parse(
4343

4444
# Requirement groups allow Bazel to tolerate PyPi cycles by putting dependencies
4545
# which are known to form cycles into groups together.
46-
requirement_cycles = {
46+
experimental_requirement_cycles = {
4747
"sphinx": [
4848
"sphinx",
4949
"sphinxcontrib-qthelp",

python/pip_install/pip_repository.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def _pip_repository_impl(rctx):
283283
# Normalize cycles first
284284
requirement_cycles = {
285285
name: sorted(sets.to_list(sets.make(deps)))
286-
for name, deps in rctx.attr.requirement_cycles.items()
286+
for name, deps in rctx.attr.experimental_requirement_cycles.items()
287287
}
288288

289289
# Check for conflicts between cycles _before_ we normalize package names so
@@ -296,7 +296,7 @@ def _pip_repository_impl(rctx):
296296
right_group = requirement_cycles.keys()[1 + i + j]
297297
for d in left_deps:
298298
if d in right_deps:
299-
fail("Error: Requirement %s is repeated between cycles %s and %s, they must be merged." % (d, left_group, right_group))
299+
fail("Error: Requirement %s cannot be repeated between cycles %s and %s; please merge the cycles." % (d, left_group, right_group))
300300

301301
# And normalize the names as used in the cycle specs
302302
#
@@ -459,7 +459,7 @@ python_interpreter. An example value: "@python3_x86_64-unknown-linux-gnu//:pytho
459459
Prefix for the generated packages will be of the form `@<prefix><sanitized-package-name>//...`
460460
""",
461461
),
462-
"requirement_cycles": attr.string_list_dict(
462+
"experimental_requirement_cycles": attr.string_list_dict(
463463
default = {},
464464
doc = """\
465465
A mapping of dependency cycle names to a list of requirements which form that cycle.
@@ -500,7 +500,7 @@ Example:
500500
```
501501
pip_parse(
502502
...
503-
requirement_cycles = {
503+
experimental_requirement_cycles = {
504504
"sphinx": [
505505
"sphinx",
506506
"sphinxcontrib-serializinghtml",

python/private/bzlmod/pip.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def _create_whl_repos(module_ctx, pip_attr, whl_map, whl_overrides):
122122

123123
requirement_cycles = {
124124
name: [normalize_name(whl_name) for whl_name in whls]
125-
for name, whls in pip_attr.requirement_cycles.items()
125+
for name, whls in pip_attr.experimental_requirement_cycles.items()
126126
}
127127

128128
whl_group_mapping = {
@@ -135,7 +135,7 @@ def _create_whl_repos(module_ctx, pip_attr, whl_map, whl_overrides):
135135
group_library(
136136
name = group_repo,
137137
repo_prefix = pip_name + "_",
138-
groups = pip_attr.requirement_cycles,
138+
groups = pip_attr.experimental_requirement_cycles,
139139
)
140140

141141
# Create a new wheel library for each of the different whls

0 commit comments

Comments
 (0)