diff --git a/.github/workflows/sitebuild.yml b/.github/workflows/sitebuild.yml index bff4d41..2e06629 100644 --- a/.github/workflows/sitebuild.yml +++ b/.github/workflows/sitebuild.yml @@ -43,7 +43,7 @@ jobs: #mkdir -p ./build/upload #export "SITEDIR=./build/upload/$(git branch --show-current)" #export "SITEURL=https://concepts.datalad.org/$(git branch --show-current)" - make mkdocs-site + make build/mkdocs-site make build/context.jsonld #mv ./build/mkdocs-site $SITEDIR mv ./build/mkdocs-site ./build/upload diff --git a/Makefile b/Makefile index ccfc52e..5340844 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,8 @@ build/context.jsonld: src/linkml/ontology.yaml --mergeimports \ $< > $@ -linkml-docs: linkml-docs-stamp -linkml-docs-stamp: +build/linkml-docs: build/linkml-docs/ontology +build/linkml-docs/%: src/linkml/%.yaml src/extra-docs/% gen-doc \ --mergeimports \ --hierarchical-class-view \ @@ -18,19 +18,15 @@ linkml-docs-stamp: --diagram-type er_diagram \ --metadata \ --format markdown \ - -d build/linkml-docs \ - src/linkml/ontology.yaml - touch $@ - -extra-docs: extra-docs-stamp -extra-docs-stamp: - mkdir -p build/linkml-docs - cp -r src/extra-docs/* build/linkml-docs + -d $@ \ + $< + # try to inject any extra-docs (if any exist) + -cp -r src/extra-docs/$$(basename $@)/*.md $@ -mkdocs-site: mkdocs-site-stamp -mkdocs-site-stamp: linkml-docs extra-docs +build/mkdocs-site: build/linkml-docs src/extra-docs/*.md + # top-level content + cp -r src/extra-docs/*.md $< mkdocs build - touch $@ lint: lint-ontology lint-dataset-graph-schema lint-ontology: src/linkml/ontology.yaml @@ -52,4 +48,4 @@ clean: rm -rf build rm -f *-stamp -.PHONY: clean linkml-docs extra-docs mkdocs-site lint validate +.PHONY: clean lint validate diff --git a/mkdocs.yml b/mkdocs.yml index c637456..0b26b8a 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -9,7 +9,7 @@ repo_url: https://github.com/psychoinformatics-de/datalad-concepts site_author: site_description: site_dir: build/mkdocs-site -site_name: DataLad Concepts Ontology (DLCO) +site_name: DataLad Concepts site_url: !ENV [SITEURL, 'https://concepts.datalad.org'] strict: true theme: diff --git a/src/extra-docs/about.md b/src/extra-docs/about.md index e69de29..415f9e4 100644 --- a/src/extra-docs/about.md +++ b/src/extra-docs/about.md @@ -0,0 +1 @@ +Write me! diff --git a/src/extra-docs/index.md b/src/extra-docs/index.md new file mode 100644 index 0000000..68ef314 --- /dev/null +++ b/src/extra-docs/index.md @@ -0,0 +1 @@ +- [DataLad concepts ontology](ontology/) diff --git a/src/extra-docs/ontology/about.md b/src/extra-docs/ontology/about.md new file mode 100644 index 0000000..e69de29 diff --git a/src/linkml/datalad-dataset-graph.yaml b/src/linkml/datalad-dataset-graph.yaml deleted file mode 100644 index bc04367..0000000 --- a/src/linkml/datalad-dataset-graph.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# schema for a specific serialization format of DataLad datasets - -id: https://concepts.datalad.org/datalad-dataset-graph -name: datalad-dataset-graph -prefixes: - dlco: https://concepts.datalad.org/ -imports: - - datalad-datasets - -classes: - DataladDatasetGraph: - tree_root: true - description: - Container for graph nodes describing DataLad dataset components. - attributes: - graph: - description: >- - DataLad dataset component graph nodes. - multivalued: true - inlined_as_list: true - range: TypedThing - # this is a future TODO: can we validate a JSONLD graph - aliases: - - "@graph" diff --git a/src/linkml/datasets.yaml b/src/linkml/datasets.yaml index e8b0f7b..f8ea4db 100644 --- a/src/linkml/datasets.yaml +++ b/src/linkml/datasets.yaml @@ -6,7 +6,7 @@ prefixes: dctypes: http://purl.org/dc/dcmitype/ dct: http://purl.org/dc/terms/ schema: http://schema.org/ - dlco: https://concepts.datalad.org/ + dlco: https://concepts.datalad.org/ontology/ linkml: https://w3id.org/linkml/ imports: - linkml:types diff --git a/src/linkml/ontology.yaml b/src/linkml/ontology.yaml index 538048f..53ca0a8 100644 --- a/src/linkml/ontology.yaml +++ b/src/linkml/ontology.yaml @@ -1,4 +1,4 @@ -id: https://concepts.datalad.org +id: https://concepts.datalad.org/ontology name: datalad-concepts-ontology title: DataLad Concepts Ontology (DLCO) description: |- @@ -7,7 +7,7 @@ license: MIT prefixes: linkml: https://w3id.org/linkml/ - dlco: https://concepts.datalad.org/ + dlco: https://concepts.datalad.org/ontology/ default_prefix: dlco