From 24a4a0c47859ce8b92a89a08953ff09165d97ee1 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 15 Aug 2023 11:33:25 -0400 Subject: [PATCH 1/2] Test catalog against CASE 2.0.0 branches A follow-on patch will regenerate Make-managed files. Signed-off-by: Alex Nelson --- .gitmodules | 8 +++++ Makefile | 16 +++++++++ catalog/postvisit.mk | 56 +++++++++++++++++++++++++++++++- dependencies/.gitignore | 2 ++ dependencies/CASE-develop-2.0.0 | 1 + dependencies/CASE-unstable-2.0.0 | 1 + dependencies/Makefile | 35 ++++++++++++++++++++ 7 files changed, 118 insertions(+), 1 deletion(-) create mode 160000 dependencies/CASE-develop-2.0.0 create mode 160000 dependencies/CASE-unstable-2.0.0 diff --git a/.gitmodules b/.gitmodules index 88ddc5f..cc914b6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,10 +6,18 @@ path = dependencies/CASE-develop url = https://github.com/casework/CASE.git branch = develop +[submodule "dependencies/CASE-develop-2.0.0"] + path = dependencies/CASE-develop-2.0.0 + url = https://github.com/casework/CASE.git + branch = develop-2.0.0 [submodule "dependencies/CASE-unstable"] path = dependencies/CASE-unstable url = https://github.com/casework/CASE-Archive.git branch = unstable +[submodule "dependencies/CASE-unstable-2.0.0"] + path = dependencies/CASE-unstable-2.0.0 + url = https://github.com/casework/CASE-Archive.git + branch = unstable-2.0.0 [submodule "dependencies/cito"] path = dependencies/cito url = https://github.com/SPAROntologies/cito.git diff --git a/Makefile b/Makefile index 69815aa..0eebca6 100644 --- a/Makefile +++ b/Makefile @@ -56,6 +56,14 @@ all: \ $(MAKE) \ --directory dependencies/CASE-develop \ .git_submodule_init.done.log + # CASE-develop-2.0.0 + test -r dependencies/CASE-develop-2.0.0/README.md \ + || git submodule update \ + --init \ + dependencies/CASE-develop-2.0.0 + $(MAKE) \ + --directory dependencies/CASE-develop-2.0.0 \ + .git_submodule_init.done.log # CASE-unstable test -r dependencies/CASE-unstable/README.md \ || git submodule update \ @@ -64,6 +72,14 @@ all: \ $(MAKE) \ --directory dependencies/CASE-unstable \ .git_submodule_init.done.log + # CASE-unstable-2.0.0 + test -r dependencies/CASE-unstable-2.0.0/README.md \ + || git submodule update \ + --init \ + dependencies/CASE-unstable-2.0.0 + $(MAKE) \ + --directory dependencies/CASE-unstable-2.0.0 \ + .git_submodule_init.done.log # cito test -r dependencies/cito/README.md \ || git submodule update \ diff --git a/catalog/postvisit.mk b/catalog/postvisit.mk index 0f33a95..cba1ad4 100644 --- a/catalog/postvisit.mk +++ b/catalog/postvisit.mk @@ -37,7 +37,9 @@ kb_all_dependencies := \ all: \ README.md \ kb-all_validation-develop.ttl \ - kb-all_validation-unstable.ttl + kb-all_validation-develop-2.0.0.ttl \ + kb-all_validation-unstable.ttl \ + kb-all_validation-unstable-2.0.0.ttl README.md: \ README.md.in \ @@ -135,6 +137,32 @@ kb-all_validation-develop.ttl: \ rm __$@ mv _$@ $@ +kb-all_validation-develop-2.0.0.ttl: \ + $(top_srcdir)/dependencies/CASE-develop-2.0.0.ttl \ + kb-all.ttl + rm -f __$@ _$@ + source $(top_srcdir)/venv/bin/activate \ + && case_validate \ + --allow-infos \ + --built-version none \ + --format turtle \ + --inference rdfs \ + --ontology-graph $(top_srcdir)/dependencies/CASE-develop-2.0.0.ttl \ + --ontology-graph $(top_srcdir)/dependencies/dependencies.ttl \ + --ontology-graph $(top_srcdir)/ontology/case-corpora.ttl \ + --ontology-graph $(top_srcdir)/shapes/local.ttl \ + --ontology-graph $(top_srcdir)/shapes/shapes.ttl \ + --output __$@ \ + kb-all.ttl + java -jar $(rdf_toolkit_jar) \ + --inline-blank-nodes \ + --source-format turtle \ + --source __$@ \ + --target-format turtle \ + --target _$@ + rm __$@ + mv _$@ $@ + kb-all_validation-unstable.ttl: \ $(top_srcdir)/dependencies/CASE-unstable.ttl \ kb-all.ttl @@ -161,6 +189,32 @@ kb-all_validation-unstable.ttl: \ rm __$@ mv _$@ $@ +kb-all_validation-unstable-2.0.0.ttl: \ + $(top_srcdir)/dependencies/CASE-unstable-2.0.0.ttl \ + kb-all.ttl + rm -f __$@ _$@ + source $(top_srcdir)/venv/bin/activate \ + && case_validate \ + --allow-infos \ + --built-version none \ + --format turtle \ + --inference rdfs \ + --ontology-graph $(top_srcdir)/dependencies/CASE-unstable-2.0.0.ttl \ + --ontology-graph $(top_srcdir)/dependencies/dependencies.ttl \ + --ontology-graph $(top_srcdir)/ontology/case-corpora.ttl \ + --ontology-graph $(top_srcdir)/shapes/local.ttl \ + --ontology-graph $(top_srcdir)/shapes/shapes.ttl \ + --output __$@ \ + kb-all.ttl + java -jar $(rdf_toolkit_jar) \ + --inline-blank-nodes \ + --source-format turtle \ + --source __$@ \ + --target-format turtle \ + --target _$@ + rm __$@ + mv _$@ $@ + kb-datasets.ttl: \ $(kb_datasets_dependencies) \ $(rdf_toolkit_jar) \ diff --git a/dependencies/.gitignore b/dependencies/.gitignore index dfc98a6..a909400 100644 --- a/dependencies/.gitignore +++ b/dependencies/.gitignore @@ -1,2 +1,4 @@ CASE-develop.ttl +CASE-develop-2.0.0.ttl CASE-unstable.ttl +CASE-unstable-2.0.0.ttl diff --git a/dependencies/CASE-develop-2.0.0 b/dependencies/CASE-develop-2.0.0 new file mode 160000 index 0000000..8c58d65 --- /dev/null +++ b/dependencies/CASE-develop-2.0.0 @@ -0,0 +1 @@ +Subproject commit 8c58d65e745fde5ecdd6f9470b75dc47505f1001 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 new file mode 160000 index 0000000..cb98994 --- /dev/null +++ b/dependencies/CASE-unstable-2.0.0 @@ -0,0 +1 @@ +Subproject commit cb9899480ecd44b12854c912749e7c775591ee59 diff --git a/dependencies/Makefile b/dependencies/Makefile index 5f5996c..d430dd7 100644 --- a/dependencies/Makefile +++ b/dependencies/Makefile @@ -24,11 +24,21 @@ case_develop_ttls := \ $(wildcard CASE-develop/dependencies/UCO/ontology/*/*.ttl) \ $(wildcard CASE-develop/dependencies/UCO/ontology/uco/*/*.ttl) +case_develop_2_0_0_ttls := \ + $(wildcard CASE-develop-2.0.0/ontology/*/*.ttl) \ + $(wildcard CASE-develop-2.0.0/dependencies/UCO/ontology/*/*.ttl) \ + $(wildcard CASE-develop-2.0.0/dependencies/UCO/ontology/uco/*/*.ttl) + case_unstable_ttls := \ $(wildcard CASE-unstable/ontology/*/*.ttl) \ $(wildcard CASE-unstable/dependencies/UCO/ontology/*/*.ttl) \ $(wildcard CASE-unstable/dependencies/UCO/ontology/uco/*/*.ttl) +case_unstable_2_0_0_ttls := \ + $(wildcard CASE-unstable-2.0.0/ontology/*/*.ttl) \ + $(wildcard CASE-unstable-2.0.0/dependencies/UCO/ontology/*/*.ttl) \ + $(wildcard CASE-unstable-2.0.0/dependencies/UCO/ontology/uco/*/*.ttl) + dependent_ontology_files := \ cito.ttl \ cpannotationschema.ttl \ @@ -53,7 +63,9 @@ rdf_toolkit_jar := $(top_srcdir)/dependencies/CASE/dependencies/UCO/lib/rdf-tool all: \ CASE-develop.ttl \ + CASE-develop-2.0.0.ttl \ CASE-unstable.ttl \ + CASE-unstable-2.0.0.ttl \ catalog-v001.xml \ dcat-us.jsonld @@ -68,16 +80,39 @@ CASE-develop.ttl: \ > _$@ mv _$@ $@ +CASE-develop-2.0.0.ttl: \ + $(top_srcdir)/.venv.done.log \ + $(case_develop_2_0_0_ttls) + rm -f _$@ + source $(top_srcdir)/venv/bin/activate \ + && rdfpipe \ + --output-format turtle \ + $(case_develop_2_0_0_ttls) \ + > _$@ + mv _$@ $@ + CASE-unstable.ttl: \ $(top_srcdir)/.venv.done.log \ $(case_unstable_ttls) rm -f _$@ source $(top_srcdir)/venv/bin/activate \ && rdfpipe \ + --output-format turtle \ $(case_unstable_ttls) \ > _$@ mv _$@ $@ +CASE-unstable-2.0.0.ttl: \ + $(top_srcdir)/.venv.done.log \ + $(case_unstable_2_0_0_ttls) + rm -f _$@ + source $(top_srcdir)/venv/bin/activate \ + && rdfpipe \ + --output-format turtle \ + $(case_unstable_2_0_0_ttls) \ + > _$@ + mv _$@ $@ + catalog-v001.xml: \ $(case_srcdir)/ontology/master/catalog-v001.xml \ $(top_srcdir)/.venv.done.log \ From 5a5248a8bb8b6d04e28740c0339b8142fdd510e4 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 15 Aug 2023 11:49:19 -0400 Subject: [PATCH 2/2] Regenerate Make-managed files Signed-off-by: Alex Nelson --- catalog/kb-all_validation-develop-2.0.0.ttl | 11 +++++++++++ catalog/kb-all_validation-unstable-2.0.0.ttl | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 catalog/kb-all_validation-develop-2.0.0.ttl create mode 100644 catalog/kb-all_validation-unstable-2.0.0.ttl diff --git a/catalog/kb-all_validation-develop-2.0.0.ttl b/catalog/kb-all_validation-develop-2.0.0.ttl new file mode 100644 index 0000000..33496ff --- /dev/null +++ b/catalog/kb-all_validation-develop-2.0.0.ttl @@ -0,0 +1,11 @@ +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + +[] + a sh:ValidationReport ; + sh:conforms "true"^^xsd:boolean ; + . + diff --git a/catalog/kb-all_validation-unstable-2.0.0.ttl b/catalog/kb-all_validation-unstable-2.0.0.ttl new file mode 100644 index 0000000..33496ff --- /dev/null +++ b/catalog/kb-all_validation-unstable-2.0.0.ttl @@ -0,0 +1,11 @@ +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + +[] + a sh:ValidationReport ; + sh:conforms "true"^^xsd:boolean ; + . +