Skip to content

Commit 1e9e76f

Browse files
aignasaignas
committed
chore: remove the internal usages of the deprecated py_binary and py_test
1 parent f219112 commit 1e9e76f

File tree

7 files changed

+76
-51
lines changed

7 files changed

+76
-51
lines changed

‎examples/bzlmod/tests/BUILD.bazel‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
load("@python_versions//3.10:defs.bzl", py_binary_3_10 = "py_binary", py_test_3_10 = "py_test")
2-
load("@python_versions//3.11:defs.bzl", py_binary_3_11 = "py_binary", py_test_3_11 = "py_test")
3-
load("@python_versions//3.9:defs.bzl", py_binary_3_9 = "py_binary", py_test_3_9 = "py_test")
41
load("@pythons_hub//:versions.bzl", "MINOR_MAPPING")
52
load("@rules_python//python:py_binary.bzl", "py_binary")
63
load("@rules_python//python:py_test.bzl", "py_test")
7-
load("@rules_python//python/config_settings:transition.bzl", py_versioned_binary = "py_binary", py_versioned_test = "py_test")
84
load("@rules_shell//shell:sh_test.bzl", "sh_test")
95

106
py_binary(
@@ -13,25 +9,28 @@ py_binary(
139
main = "version.py",
1410
)
1511

16-
py_binary_3_9(
12+
py_binary(
13+
python_version = "3.9",
1714
name = "version_3_9",
1815
srcs = ["version.py"],
1916
main = "version.py",
2017
)
2118

22-
py_binary_3_10(
19+
py_binary(
20+
python_version = "3.10",
2321
name = "version_3_10",
2422
srcs = ["version.py"],
2523
main = "version.py",
2624
)
2725

28-
py_binary_3_11(
26+
py_binary(
27+
python_version = "3.11",
2928
name = "version_3_11",
3029
srcs = ["version.py"],
3130
main = "version.py",
3231
)
3332

34-
py_versioned_binary(
33+
py_binary(
3534
name = "version_3_10_versioned",
3635
srcs = ["version.py"],
3736
main = "version.py",
@@ -49,21 +48,23 @@ py_test(
4948
deps = ["//libs/my_lib"],
5049
)
5150

52-
py_test_3_9(
51+
py_test(
52+
python_version = "3.9",
5353
name = "my_lib_3_9_test",
5454
srcs = ["my_lib_test.py"],
5555
main = "my_lib_test.py",
5656
deps = ["//libs/my_lib"],
5757
)
5858

59-
py_test_3_10(
59+
py_test(
6060
name = "my_lib_3_10_test",
61+
python_version = "3.10",
6162
srcs = ["my_lib_test.py"],
6263
main = "my_lib_test.py",
6364
deps = ["//libs/my_lib"],
6465
)
6566

66-
py_versioned_test(
67+
py_test(
6768
name = "my_lib_versioned_test",
6869
srcs = ["my_lib_test.py"],
6970
main = "my_lib_test.py",
@@ -92,29 +93,32 @@ py_test(
9293
main = "version_test.py",
9394
)
9495

95-
py_test_3_9(
96+
py_test(
97+
python_version = "3.9",
9698
name = "version_3_9_test",
9799
srcs = ["version_test.py"],
98100
env = {"VERSION_CHECK": "3.9"},
99101
main = "version_test.py",
100102
)
101103

102-
py_test_3_10(
104+
py_test(
105+
python_version = "3.10",
103106
name = "version_3_10_test",
104107
srcs = ["version_test.py"],
105108
env = {"VERSION_CHECK": "3.10"},
106109
main = "version_test.py",
107110
)
108111

109-
py_versioned_test(
112+
py_test(
110113
name = "version_versioned_test",
111114
srcs = ["version_test.py"],
112115
env = {"VERSION_CHECK": "3.10"},
113116
main = "version_test.py",
114117
python_version = "3.10",
115118
)
116119

117-
py_test_3_11(
120+
py_test(
121+
python_version = "3.11",
118122
name = "version_3_11_test",
119123
srcs = ["version_test.py"],
120124
env = {"VERSION_CHECK": "3.11"},
@@ -133,7 +137,8 @@ py_test(
133137
main = "cross_version_test.py",
134138
)
135139

136-
py_test_3_10(
140+
py_test(
141+
python_version = "3.10",
137142
name = "version_3_10_takes_3_9_subprocess_test",
138143
srcs = ["cross_version_test.py"],
139144
data = [":version_3_9"],
@@ -145,7 +150,7 @@ py_test_3_10(
145150
main = "cross_version_test.py",
146151
)
147152

148-
py_versioned_test(
153+
py_test(
149154
name = "version_3_10_takes_3_9_subprocess_test_2",
150155
srcs = ["cross_version_test.py"],
151156
data = [":version_3_9"],

‎examples/multi_python_versions/requirements/BUILD.bazel‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
1-
load("@python//3.10:defs.bzl", compile_pip_requirements_3_10 = "compile_pip_requirements")
2-
load("@python//3.11:defs.bzl", compile_pip_requirements_3_11 = "compile_pip_requirements")
3-
load("@python//3.8:defs.bzl", compile_pip_requirements_3_8 = "compile_pip_requirements")
4-
load("@python//3.9:defs.bzl", compile_pip_requirements_3_9 = "compile_pip_requirements")
1+
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
52

6-
compile_pip_requirements_3_8(
3+
compile_pip_requirements(
74
name = "requirements_3_8",
85
src = "requirements.in",
6+
python_version = "3.8",
97
requirements_txt = "requirements_lock_3_8.txt",
108
)
119

12-
compile_pip_requirements_3_9(
10+
compile_pip_requirements(
1311
name = "requirements_3_9",
1412
src = "requirements.in",
13+
python_version = "3.9",
1514
requirements_txt = "requirements_lock_3_9.txt",
1615
)
1716

18-
compile_pip_requirements_3_10(
17+
compile_pip_requirements(
1918
name = "requirements_3_10",
2019
src = "requirements.in",
20+
python_version = "3.10",
2121
requirements_txt = "requirements_lock_3_10.txt",
2222
)
2323

24-
compile_pip_requirements_3_11(
24+
compile_pip_requirements(
2525
name = "requirements_3_11",
2626
src = "requirements.in",
27+
python_version = "3.11",
2728
requirements_txt = "requirements_lock_3_11.txt",
2829
)

‎examples/multi_python_versions/tests/BUILD.bazel‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
22
load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
33
load("@bazel_skylib//rules:write_file.bzl", "write_file")
4-
load("@python//3.10:defs.bzl", py_binary_3_10 = "py_binary", py_test_3_10 = "py_test")
5-
load("@python//3.11:defs.bzl", py_binary_3_11 = "py_binary", py_test_3_11 = "py_test")
6-
load("@python//3.8:defs.bzl", py_binary_3_8 = "py_binary", py_test_3_8 = "py_test")
7-
load("@python//3.9:defs.bzl", py_binary_3_9 = "py_binary", py_test_3_9 = "py_test")
84
load("@pythons_hub//:versions.bzl", "MINOR_MAPPING", "PYTHON_VERSIONS")
95
load("@rules_python//python:py_binary.bzl", "py_binary")
106
load("@rules_python//python:py_test.bzl", "py_test")
@@ -26,25 +22,29 @@ py_binary(
2622
srcs = ["version_default.py"],
2723
)
2824

29-
py_binary_3_8(
25+
py_binary(
26+
python_version = "3.8",
3027
name = "version_3_8",
3128
srcs = ["version.py"],
3229
main = "version.py",
3330
)
3431

35-
py_binary_3_9(
32+
py_binary(
33+
python_version = "3.9",
3634
name = "version_3_9",
3735
srcs = ["version.py"],
3836
main = "version.py",
3937
)
4038

41-
py_binary_3_10(
39+
py_binary(
40+
python_version = "3.10",
4241
name = "version_3_10",
4342
srcs = ["version.py"],
4443
main = "version.py",
4544
)
4645

47-
py_binary_3_11(
46+
py_binary(
47+
python_version = "3.11",
4848
name = "version_3_11",
4949
srcs = ["version.py"],
5050
main = "version.py",
@@ -57,28 +57,32 @@ py_test(
5757
deps = ["//libs/my_lib"],
5858
)
5959

60-
py_test_3_8(
60+
py_test(
61+
python_version = "3.8",
6162
name = "my_lib_3_8_test",
6263
srcs = ["my_lib_test.py"],
6364
main = "my_lib_test.py",
6465
deps = ["//libs/my_lib"],
6566
)
6667

67-
py_test_3_9(
68+
py_test(
69+
python_version = "3.9",
6870
name = "my_lib_3_9_test",
6971
srcs = ["my_lib_test.py"],
7072
main = "my_lib_test.py",
7173
deps = ["//libs/my_lib"],
7274
)
7375

74-
py_test_3_10(
76+
py_test(
77+
python_version = "3.10",
7578
name = "my_lib_3_10_test",
7679
srcs = ["my_lib_test.py"],
7780
main = "my_lib_test.py",
7881
deps = ["//libs/my_lib"],
7982
)
8083

81-
py_test_3_11(
84+
py_test(
85+
python_version = "3.11",
8286
name = "my_lib_3_11_test",
8387
srcs = ["my_lib_test.py"],
8488
main = "my_lib_test.py",
@@ -98,28 +102,32 @@ py_test(
98102
env = {"VERSION_CHECK": "3.9"}, # The default defined in the WORKSPACE.
99103
)
100104

101-
py_test_3_8(
105+
py_test(
106+
python_version = "3.8",
102107
name = "version_3_8_test",
103108
srcs = ["version_test.py"],
104109
env = {"VERSION_CHECK": "3.8"},
105110
main = "version_test.py",
106111
)
107112

108-
py_test_3_9(
113+
py_test(
114+
python_version = "3.9",
109115
name = "version_3_9_test",
110116
srcs = ["version_test.py"],
111117
env = {"VERSION_CHECK": "3.9"},
112118
main = "version_test.py",
113119
)
114120

115-
py_test_3_10(
121+
py_test(
122+
python_version = "3.10",
116123
name = "version_3_10_test",
117124
srcs = ["version_test.py"],
118125
env = {"VERSION_CHECK": "3.10"},
119126
main = "version_test.py",
120127
)
121128

122-
py_test_3_11(
129+
py_test(
130+
python_version = "3.11",
123131
name = "version_3_11_test",
124132
srcs = ["version_test.py"],
125133
env = {"VERSION_CHECK": "3.11"},
@@ -138,7 +146,8 @@ py_test(
138146
main = "cross_version_test.py",
139147
)
140148

141-
py_test_3_10(
149+
py_test(
150+
python_version = "3.10",
142151
name = "version_3_10_takes_3_9_subprocess_test",
143152
srcs = ["cross_version_test.py"],
144153
data = [":version_3_9"],

‎python/private/toolchains_repo.bzl‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,21 @@ def py_test(name, **kwargs):
183183
**kwargs
184184
)
185185
186+
_DEPRECATION_MESSAGE = \"\"\"
187+
The {name} symbol in @rules_python//python/config_settings:transition.bzl
188+
is deprecated. It is an alias to the regular rule; use it directly instead:
189+
load("@rules_python//python:{name}.bzl", "{name}")
190+
\"\"\"
191+
186192
def compile_pip_requirements(name, **kwargs):
193+
deprecation = _DEPRECATION_MESSAGE.format(name = "compile_pip_requirements")
194+
if kwargs.get("deprecation"):
195+
deprecation = kwargs.pop("deprecation") + "\n\n" + deprecation
196+
kwargs["deprecation"] = deprecation
197+
187198
return _compile_pip_requirements(
188199
name = name,
189-
py_binary = py_binary,
190-
py_test = py_test,
200+
python_version = "{python_version}",
191201
**kwargs
192202
)
193203

‎python/uv/private/lock.bzl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
load("@bazel_skylib//rules:write_file.bzl", "write_file")
1919
load("//python:py_binary.bzl", "py_binary")
20-
load("//python/config_settings:transition.bzl", transition_py_binary = "py_binary")
2120
load("//python/private:bzlmod_enabled.bzl", "BZLMOD_ENABLED") # buildifier: disable=bzl-visibility
2221

2322
visibility(["//..."])
@@ -94,7 +93,7 @@ def lock(*, name, srcs, out, upgrade = False, universal = True, python_version =
9493
],
9594
)
9695
if python_version:
97-
py_binary_rule = lambda *args, **kwargs: transition_py_binary(python_version = python_version, *args, **kwargs)
96+
py_binary_rule = lambda *args, **kwargs: py_binary(python_version = python_version, *args, **kwargs)
9897
else:
9998
py_binary_rule = py_binary
10099

‎tests/config_settings/transition/multi_version_tests.bzl‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
load("@rules_testing//lib:analysis_test.bzl", "analysis_test")
1717
load("@rules_testing//lib:test_suite.bzl", "test_suite")
1818
load("@rules_testing//lib:util.bzl", "TestingAspectInfo", rt_util = "util")
19+
load("//python:py_binary.bzl", "py_binary")
1920
load("//python:py_info.bzl", "PyInfo")
20-
load("//python/config_settings:transition.bzl", py_binary_transitioned = "py_binary", py_test_transitioned = "py_test")
21+
load("//python:py_test.bzl", "py_test")
2122
load("//python/private:reexports.bzl", "BuiltinPyInfo") # buildifier: disable=bzl-visibility
2223
load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER") # buildifier: disable=bzl-visibility
2324
load("//tests/support:support.bzl", "CC_TOOLCHAIN")
@@ -34,7 +35,7 @@ _tests = []
3435

3536
def _test_py_test_with_transition(name):
3637
rt_util.helper_target(
37-
py_test_transitioned,
38+
py_test,
3839
name = name + "_subject",
3940
srcs = [name + "_subject.py"],
4041
python_version = _PYTHON_VERSION,
@@ -56,7 +57,7 @@ _tests.append(_test_py_test_with_transition)
5657

5758
def _test_py_binary_with_transition(name):
5859
rt_util.helper_target(
59-
py_binary_transitioned,
60+
py_binary,
6061
name = name + "_subject",
6162
srcs = [name + "_subject.py"],
6263
python_version = _PYTHON_VERSION,
@@ -78,7 +79,7 @@ _tests.append(_test_py_binary_with_transition)
7879

7980
def _setup_py_binary_windows(name, *, impl, build_python_zip):
8081
rt_util.helper_target(
81-
py_binary_transitioned,
82+
py_binary,
8283
name = name + "_subject",
8384
srcs = [name + "_subject.py"],
8485
python_version = _PYTHON_VERSION,

‎tools/publish/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//python/config_settings:transition.bzl", "py_binary")
1+
load("//python:py_binary.bzl", "py_binary")
22
load("//python/entry_points:py_console_script_binary.bzl", "py_console_script_binary")
33
load("//tools/private:publish_deps.bzl", "publish_deps")
44

0 commit comments

Comments
 (0)