Skip to content

Commit a4e19d4

Browse files
authored
Remove empty globs (#124)
* Remove empty globs * Enable bazel disallow empty globs Enable the option to support an early detection of invalid globs in bazel functions.
1 parent bf01be1 commit a4e19d4

5 files changed

Lines changed: 7 additions & 32 deletions

File tree

.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ build --incompatible_default_to_explicit_init_py
1010

1111
common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/
1212
common --registry=https://bcr.bazel.build
13+
14+
common --incompatible_disallow_empty_glob

docs.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def docs(source_files_to_scan_for_needs_links = None, source_dir = "docs", conf_
7575
sphinx_build_binary(
7676
name = "sphinx_build" + suffix,
7777
visibility = ["//visibility:public"],
78-
data = ["@score_docs_as_code//src:docs_assets", "@score_docs_as_code//src:score_extension_files"] + external_needs_deps,
78+
data = ["@score_docs_as_code//src:docs_assets", "@score_docs_as_code//src:docs_as_code_py_modules"] + external_needs_deps,
7979
deps = sphinx_requirements + deps,
8080
)
8181
_incremental(
@@ -183,7 +183,7 @@ def _docs(name = "docs", suffix = "", format = "html", external_needs_deps = lis
183183
"**/*.json",
184184
"**/*.csv",
185185
"**/*.inc",
186-
], exclude = ["**/tests/*"]),
186+
], exclude = ["**/tests/*"], allow_empty = True),
187187
config = ":conf.py",
188188
extra_opts = [
189189
"-W",
@@ -205,7 +205,7 @@ def _docs(name = "docs", suffix = "", format = "html", external_needs_deps = lis
205205

206206
native.filegroup(
207207
name = "assets" + target_suffix,
208-
srcs = native.glob(["_assets/**"]),
208+
srcs = native.glob(["_assets/**"], allow_empty = True),
209209
visibility = ["//visibility:public"],
210210
)
211211

src/BUILD

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,6 @@ py_library(
118118
visibility = ["//visibility:public"],
119119
)
120120

121-
filegroup(
122-
name = "score_extension_files",
123-
srcs = glob(
124-
[
125-
"src/**",
126-
],
127-
exclude = [
128-
"**/test/**",
129-
"**/tests/**",
130-
"**/__pycache__/**",
131-
],
132-
) + [":docs_as_code_py_modules"],
133-
visibility = ["//visibility:public"],
134-
)
135-
136121
filegroup(
137122
name = "docs_assets",
138123
srcs = glob([
@@ -153,17 +138,6 @@ filegroup(
153138
visibility = ["//visibility:public"],
154139
)
155140

156-
# Needed for 'test_rules_file_based'
157-
filegroup(
158-
name = "test_rst_files",
159-
srcs = glob([
160-
"extensions/**/*.rst",
161-
"extensions/**/*.py",
162-
"conf.py",
163-
]),
164-
visibility = ["//visibility:public"],
165-
)
166-
167141
dash_license_checker(
168142
src = ":requirements_lock",
169143
file_type = "requirements",

src/extensions/score_metamodel/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ score_py_pytest(
3333
size = "small",
3434
srcs = glob(["tests/*.py"]),
3535
# All requirements already in the library so no need to have it double
36-
data = ["//src:test_rst_files"] + glob(
36+
data = glob(
3737
["tests/**/*.rst"],
3838
),
3939
deps = [":score_metamodel"],

src/extensions/score_source_code_linker/BUILD

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ score_py_pytest(
3030
name = "score_source_code_linker_test",
3131
size = "small",
3232
srcs = glob([
33-
"tests/**/*.py",
34-
"test/**/*.json",
33+
"tests/*.py",
3534
]),
3635
args = [
3736
"-s",

0 commit comments

Comments
 (0)