Skip to content

Commit dd5db65

Browse files
authored
chore: move files out of private/common (bazel-contrib#2285)
The "common" subdir was just carried over from the original file layout in Bazel. It's not necessary in rules_python. Remove it to simplify, since various newly added code is going directly into private, not into private/common.
1 parent 5978390 commit dd5db65

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+785
-359
lines changed

docs/BUILD.bazel

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ sphinx_stardocs(
9797
"//python/cc:py_cc_toolchain_bzl",
9898
"//python/cc:py_cc_toolchain_info_bzl",
9999
"//python/entry_points:py_console_script_binary_bzl",
100+
"//python/private:py_binary_rule_bazel_bzl",
100101
"//python/private:py_cc_toolchain_rule_bzl",
102+
"//python/private:py_library_rule_bazel_bzl",
103+
"//python/private:py_runtime_rule_bzl",
104+
"//python/private:py_test_rule_bazel_bzl",
101105
"//python/private/api:py_common_api_bzl",
102-
"//python/private/common:py_binary_rule_bazel_bzl",
103-
"//python/private/common:py_library_rule_bazel_bzl",
104-
"//python/private/common:py_runtime_rule_bzl",
105-
"//python/private/common:py_test_rule_bazel_bzl",
106106
] + ([
107107
# Bazel 6 + Stardoc isn't able to parse something about the python bzlmod extension
108108
"//python/extensions:python_bzl",

docs/conf.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
autodoc2_docstring_parser_regexes = [
6060
(".*", "myst"),
6161
]
62-
62+
6363
# NOTE: The redirects generation will clobber existing files.
6464
redirects = {
6565
"api/tools/precompiler/index": "/api/rules_python/tools/precompiler/index.html",
@@ -69,10 +69,10 @@
6969
"api/python/defs": "/api/rules_python/python/defs.html",
7070
"api/python/index": "/api/rules_python/python/index.html",
7171
"api/python/py_runtime_info": "/api/rules_python/python/py_runtime_info.html",
72-
"api/python/private/common/py_library_rule_bazel": "/api/rules_python/python/private/common/py_library_rule_bazel.html",
73-
"api/python/private/common/py_test_rule_bazel": "/api/rules_python/python/private/common/py_test_rule_bazel.html",
74-
"api/python/private/common/py_binary_rule_bazel": "/api/rules_python/python/private/common/py_binary_rule_bazel.html",
75-
"api/python/private/common/py_runtime_rule": "/api/rules_python/python/private/common/py_runtime_rule.html",
72+
"api/python/private/common/py_library_rule_bazel": "/api/rules_python/python/private/py_library_rule_bazel.html",
73+
"api/python/private/common/py_test_rule_bazel": "/api/rules_python/python/private/py_test_rule_bazel.html",
74+
"api/python/private/common/py_binary_rule_bazel": "/api/rules_python/python/private/py_binary_rule_bazel.html",
75+
"api/python/private/common/py_runtime_rule": "/api/rules_python/python/private/py_runtime_rule.html",
7676
"api/python/extensions/pip": "/api/rules_python/python/extensions/pip.html",
7777
"api/python/extensions/python": "/api/rules_python/python/extensions/python.html",
7878
"api/python/entry_points/py_console_script_binary": "/api/rules_python/python/entry_points/py_console_script_binary.html",

examples/bzlmod/MODULE.bazel.lock

+174-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python/BUILD.bazel

+6-6
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ bzl_library(
124124
name = "py_binary_bzl",
125125
srcs = ["py_binary.bzl"],
126126
deps = [
127+
"//python/private:py_binary_macro_bazel_bzl",
127128
"//python/private:register_extension_info_bzl",
128129
"//python/private:util_bzl",
129-
"//python/private/common:py_binary_macro_bazel_bzl",
130130
"@rules_python_internal//:rules_python_config_bzl",
131131
],
132132
)
@@ -135,7 +135,7 @@ bzl_library(
135135
name = "py_cc_link_params_info_bzl",
136136
srcs = ["py_cc_link_params_info.bzl"],
137137
deps = [
138-
"//python/private/common:providers_bzl",
138+
"//python/private:py_cc_link_params_info_bzl",
139139
"@rules_python_internal//:rules_python_config_bzl",
140140
],
141141
)
@@ -178,9 +178,9 @@ bzl_library(
178178
name = "py_library_bzl",
179179
srcs = ["py_library.bzl"],
180180
deps = [
181+
"//python/private:py_library_macro_bazel_bzl",
181182
"//python/private:register_extension_info_bzl",
182183
"//python/private:util_bzl",
183-
"//python/private/common:py_library_macro_bazel_bzl",
184184
"@rules_python_internal//:rules_python_config_bzl",
185185
],
186186
)
@@ -189,8 +189,8 @@ bzl_library(
189189
name = "py_runtime_bzl",
190190
srcs = ["py_runtime.bzl"],
191191
deps = [
192+
"//python/private:py_runtime_macro_bzl",
192193
"//python/private:util_bzl",
193-
"//python/private/common:py_runtime_macro_bzl",
194194
],
195195
)
196196

@@ -208,9 +208,9 @@ bzl_library(
208208
name = "py_runtime_info_bzl",
209209
srcs = ["py_runtime_info.bzl"],
210210
deps = [
211+
"//python/private:py_runtime_info_bzl",
211212
"//python/private:reexports_bzl",
212213
"//python/private:util_bzl",
213-
"//python/private/common:providers_bzl",
214214
"@rules_python_internal//:rules_python_config_bzl",
215215
],
216216
)
@@ -219,9 +219,9 @@ bzl_library(
219219
name = "py_test_bzl",
220220
srcs = ["py_test.bzl"],
221221
deps = [
222+
"//python/private:py_test_macro_bazel_bzl",
222223
"//python/private:register_extension_info_bzl",
223224
"//python/private:util_bzl",
224-
"//python/private/common:py_test_macro_bazel_bzl",
225225
"@rules_python_internal//:rules_python_config_bzl",
226226
],
227227
)

0 commit comments

Comments
 (0)