Skip to content

Commit 4126f47

Browse files
committed
Add support for term weaver expansion
1 parent e48b807 commit 4126f47

4 files changed

Lines changed: 94 additions & 495 deletions

File tree

‎justfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ test: _test-schema _test-python _test-examples
8989

9090
# Run linting
9191
[group('model development')]
92-
lint:
92+
lint: expand
9393
uv run linkml-lint --config .linkml-linter.yaml {{source_schema_dir}}
9494

9595
# Generate md documentation for the schema
@@ -183,7 +183,7 @@ _update-linkml:
183183
uv add linkml --upgrade-package linkml
184184

185185
# Test schema generation
186-
_test-schema:
186+
_test-schema: expand
187187
uv run gen-project {{config_yaml}} -d tmp {{source_schema_path}}
188188

189189
# Run Python unit tests with pytest

‎project.justfile‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,14 @@ gen-dbtmodel:
2626
[group('model development')]
2727
update-cam:
2828
uv run update-cam -l src/include_access_model/schema/include_access_model.yaml -d src/include_access_model/schema/upstream-models
29+
30+
# Expand enum files
31+
[group('model development')]
32+
expand:
33+
uv run weaver -s src/{{schema_name}}/schema
34+
35+
36+
# Deletes permissible_values block from enum file so it can be re-expanded
37+
[group('model development')]
38+
clear file_path:
39+
uv run weaver --clear src/common_access_model/schema/enums/{{file_path}}.yaml

‎pyproject.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ authors = [
1313
license = "MIT"
1414
license-files = ["LICENSE"]
1515
readme = "README.md"
16-
requires-python = ">=3.10,<4.0"
16+
requires-python = ">=3.12,<4.0"
1717
dynamic = ["version"]
1818

1919
dependencies = [
@@ -22,6 +22,7 @@ dependencies = [
2222
"linkml>=1.11.0",
2323
"linkml-runtime>=1.11.0",
2424
"the-caddie",
25+
"term-weaver"
2526
]
2627

2728
[dependency-groups]
@@ -91,4 +92,4 @@ extend-exclude = [
9192

9293
[tool.uv.sources]
9394
the-caddie = { git = "https://github.com/carrollaboratory/the-caddie" }
94-
#the-caddie = { path = "/home/torstees/dev/the-caddie" }
95+
term-weaver = { git = "https://github.com/include-dcc/term-weaver" }

0 commit comments

Comments
 (0)