Skip to content

Commit 9cd0500

Browse files
committed
Remove empty globs
Add support for bazel setting incompatible_disallow_empty_glob to detect unintentional empty globs. Remove following filegroups with empty globs: * score_extension_files, replace its usages with docs_as_code_py_modules. * test_rst_files: test content already covered by glob in score_metamodel_tests
1 parent cddce74 commit 9cd0500

4 files changed

Lines changed: 5 additions & 31 deletions

File tree

docs.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def docs(source_files_to_scan_for_needs_links = None, source_dir = "docs", conf_
8383
sphinx_build_binary(
8484
name = "sphinx_build" + suffix,
8585
visibility = ["//visibility:public"],
86-
data = ["@score_docs_as_code//src:docs_assets", "@score_docs_as_code//src:score_extension_files"] + external_needs_deps,
86+
data = ["@score_docs_as_code//src:docs_assets", "@score_docs_as_code//src:docs_as_code_py_modules"] + external_needs_deps,
8787
deps = sphinx_requirements + deps,
8888
)
8989
_incremental(
@@ -191,7 +191,7 @@ def _docs(name = "docs", suffix = "", format = "html", external_needs_deps = lis
191191
"**/*.json",
192192
"**/*.csv",
193193
"**/*.inc",
194-
], exclude = ["**/tests/*"]),
194+
], exclude = ["**/tests/*"], allow_empty = True),
195195
config = ":conf.py",
196196
extra_opts = [
197197
"-W",
@@ -214,7 +214,7 @@ def _docs(name = "docs", suffix = "", format = "html", external_needs_deps = lis
214214

215215
native.filegroup(
216216
name = "assets" + target_suffix,
217-
srcs = native.glob(["_assets/**"]),
217+
srcs = native.glob(["_assets/**"], allow_empty = True),
218218
visibility = ["//visibility:public"],
219219
)
220220

docs/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ docs(
4949
],
5050
source_dir = "docs",
5151
source_files_to_scan_for_needs_links = [
52-
"//src:score_extension_files",
52+
"//src:docs_as_code_py_modules",
5353
],
5454
)

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"],

0 commit comments

Comments
 (0)