Skip to content

Commit 01055eb

Browse files
Integrate pytest plugin & new tooling structure (#220)
Added first testlink decorator Improved / added testlinking to source code linker README Changed imports to adapt new score_tooling structure
1 parent 6970b40 commit 01055eb

18 files changed

Lines changed: 305 additions & 175 deletions

File tree

BUILD

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
load("@score_cr_checker//:cr_checker.bzl", "copyright_checker")
14+
load("@aspect_rules_py//py:defs.bzl", "py_library")
15+
load("@score_tooling//:defs.bzl", "copyright_checker")
1516
load("//:docs.bzl", "docs")
1617

1718
package(default_visibility = ["//visibility:public"])
@@ -23,8 +24,8 @@ copyright_checker(
2324
"//:BUILD",
2425
"//:MODULE.bazel",
2526
],
26-
config = "@score_cr_checker//resources:config",
27-
template = "@score_cr_checker//resources:templates",
27+
config = "@score_tooling//cr_checker/resources:config",
28+
template = "@score_tooling//cr_checker/resources:templates",
2829
visibility = ["//visibility:public"],
2930
)
3031

MODULE.bazel

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,24 @@ http_file(
8888
)
8989

9090
# Provides, pytest & venv
91-
bazel_dep(name = "score_python_basics", version = "0.3.4")
91+
# bazel_dep(name = "score_python_basics", version = "0.3.4")
92+
# local_path_override(
93+
# module_name = "score_python_basics",
94+
# path="../tooling"
95+
# )
9296

9397
# Checker rule for CopyRight checks/fixes
94-
bazel_dep(name = "score_cr_checker", version = "0.3.1")
95-
bazel_dep(name = "score_dash_license_checker", version = "0.1.1")
9698

9799
# docs dependency
98100
bazel_dep(name = "score_process", version = "1.1.1-Beta")
99101

100102
# Add Linter
101103
bazel_dep(name = "rules_multitool", version = "1.2.0")
102-
bazel_dep(
103-
name = "score_linter",
104-
version = "0.1.0",
104+
bazel_dep(name = "score_tooling", version = "0.0.0")
105+
git_override(
106+
module_name = "score_tooling",
107+
commit = "0fc82801df8356571582527e907662e4875fef36",
108+
remote = "https://github.com/eclipse-score/tooling",
105109
)
106110

107111
multitool_root = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")

docs.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
4444
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
4545
load("@rules_python//sphinxdocs:sphinx.bzl", "sphinx_build_binary", "sphinx_docs")
4646
load("@rules_python//sphinxdocs:sphinx_docs_library.bzl", "sphinx_docs_library")
47-
load("@score_python_basics//:defs.bzl", "score_virtualenv")
47+
load("@score_tooling//:defs.bzl", "score_virtualenv")
4848

4949
def docs(source_dir = "docs", data = [], deps = []):
5050
"""
@@ -63,6 +63,8 @@ def docs(source_dir = "docs", data = [], deps = []):
6363
"@score_docs_as_code//src/extensions/score_layout:score_layout",
6464
"@score_docs_as_code//src/extensions/score_metamodel:score_metamodel",
6565
"@score_docs_as_code//src/extensions/score_source_code_linker:score_source_code_linker",
66+
# NOTE: Do not comment this in, can only be enabled once tooling is released & process upgraded
67+
#"@score_tooling//python_basics/score_pytest:attribute_plugin"
6668
]
6769

6870
sphinx_build_binary(

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"score_metamodel",
4040
"score_draw_uml_funcs",
4141
"score_layout",
42+
"sphinxcontrib.mermaid",
4243
]
4344

4445
myst_enable_extensions = ["colon_fence"]

0 commit comments

Comments
 (0)