Skip to content

Commit 2cc5ee8

Browse files
authored
Cleanup (#405)
1 parent a38e999 commit 2cc5ee8

12 files changed

Lines changed: 15 additions & 38 deletions

File tree

MODULE.bazel

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ module(
1818
version = "0.0.0",
1919
)
2020

21-
###############################################################################
22-
#
23-
# Packaging dependencies
24-
#
25-
###############################################################################
26-
bazel_dep(name = "rules_pkg", version = "1.1.0")
27-
2821
###############################################################################
2922
#
3023
# Python version
@@ -51,11 +44,11 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
5144
pip.parse(
5245
envsubst = ["PIP_INDEX_URL"],
5346
extra_pip_args = ["--index-url=${PIP_INDEX_URL:-https://pypi.org/simple/}"],
54-
hub_name = "pip_process",
47+
hub_name = "docs_as_code_hub_env",
5548
python_version = PYTHON_VERSION,
5649
requirements_lock = "//src:requirements.txt",
5750
)
58-
use_repo(pip, "pip_process")
51+
use_repo(pip, "docs_as_code_hub_env")
5952

6053
# Additional Python rules provided by aspect, e.g. an improved version of
6154
bazel_dep(name = "aspect_rules_py", version = "1.4.0")

docs.bzl

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ Easy streamlined way for S-CORE docs-as-code.
4242
# For user-facing documentation, refer to `/README.md`.
4343

4444
load("@aspect_rules_py//py:defs.bzl", "py_binary")
45-
load("@pip_process//:requirements.bzl", "all_requirements")
46-
load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
45+
load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
4746
load("@rules_python//sphinxdocs:sphinx.bzl", "sphinx_build_binary", "sphinx_docs")
4847
load("@score_tooling//:defs.bzl", "score_virtualenv")
4948
load("@score_tooling//bazel/rules/rules_score:rules_score.bzl", "sphinx_module")
@@ -120,7 +119,7 @@ def docs(source_dir = "docs", data = [], deps = [], scan_code = []):
120119
deps = deps,
121120
)
122121

123-
pkg_files(
122+
native.filegroup(
124123
name = "docs_sources",
125124
srcs = native.glob([
126125
source_dir + "/**/*.png",
@@ -137,7 +136,6 @@ def docs(source_dir = "docs", data = [], deps = [], scan_code = []):
137136
source_dir + "/**/*.inc",
138137
"more_docs/**/*.rst",
139138
], allow_empty = True),
140-
strip_prefix = strip_prefix.from_pkg(), # avoid flattening of folders
141139
visibility = ["//visibility:public"],
142140
)
143141

@@ -259,21 +257,7 @@ def docs(source_dir = "docs", data = [], deps = [], scan_code = []):
259257

260258
sphinx_module(
261259
name = native.module_name() + "_module",
262-
srcs = native.glob([
263-
source_dir + "/**/*.rst",
264-
source_dir + "/**/*.png",
265-
source_dir + "/**/*.svg",
266-
source_dir + "/**/*.md",
267-
source_dir + "/**/*.html",
268-
source_dir + "/**/*.css",
269-
source_dir + "/**/*.puml",
270-
source_dir + "/**/*.need",
271-
source_dir + "/**/*.yaml",
272-
source_dir + "/**/*.json",
273-
source_dir + "/**/*.csv",
274-
source_dir + "/**/*.inc",
275-
"more_docs/**/*.rst",
276-
], allow_empty = True),
260+
srcs = [":docs_sources"],
277261
# config = ":" + source_dir + "/conf.py",
278262
index = source_dir + "/index.rst",
279263
sphinx = "@score_tooling//bazel/rules/rules_score:score_build",

scripts_bazel/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# *******************************************************************************
1313

1414
load("@aspect_rules_py//py:defs.bzl", "py_binary")
15-
load("@pip_process//:requirements.bzl", "all_requirements")
15+
load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
1616

1717
filegroup(
1818
name = "sources",

scripts_bazel/tests/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
load("@pip_process//:requirements.bzl", "all_requirements")
14+
load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
1515
load("@score_tooling//:defs.bzl", "score_py_pytest")
1616

1717
score_py_pytest(

src/extensions/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# *******************************************************************************
1313

1414
load("@aspect_rules_py//py:defs.bzl", "py_binary", "py_library")
15-
load("@pip_process//:requirements.bzl", "all_requirements")
15+
load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
1616
load("@score_tooling//:defs.bzl", "score_py_pytest", "score_virtualenv")
1717

1818
py_library(

src/extensions/score_draw_uml_funcs/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313
load("@aspect_rules_py//py:defs.bzl", "py_library")
14-
load("@pip_process//:requirements.bzl", "all_requirements")
14+
load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
1515

1616
filegroup(
1717
name = "all_sources",

src/extensions/score_header_service/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# *******************************************************************************
1313

1414
load("@aspect_rules_py//py:defs.bzl", "py_library")
15-
load("@pip_process//:requirements.bzl", "all_requirements")
15+
load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
1616
load("@score_tooling//:defs.bzl", "score_py_pytest")
1717

1818
filegroup(

src/extensions/score_layout/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313
load("@aspect_rules_py//py:defs.bzl", "py_library")
14-
load("@pip_process//:requirements.bzl", "requirement")
14+
load("@docs_as_code_hub_env//:requirements.bzl", "requirement")
1515

1616
filegroup(
1717
name = "all_sources",

src/extensions/score_metamodel/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# *******************************************************************************
1313

1414
load("@aspect_rules_py//py:defs.bzl", "py_library")
15-
load("@pip_process//:requirements.bzl", "all_requirements")
15+
load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
1616
load("@score_tooling//:defs.bzl", "score_py_pytest")
1717

1818
filegroup(

src/extensions/score_sphinx_bundle/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313
load("@aspect_rules_py//py:defs.bzl", "py_library")
14-
load("@pip_process//:requirements.bzl", "all_requirements")
14+
load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
1515

1616
filegroup(
1717
name = "all_sources",

0 commit comments

Comments
 (0)