Merge pull request #61 from casework/test_against_2_0_0

Test catalog against CASE 2.0.0 branches

Author: ajnelson-nist

.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

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 \

catalog/kb-all_validation-develop-2.0.0.ttl

@@ -0,0 +1,11 @@
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+[]
+	a sh:ValidationReport ;
+	sh:conforms "true"^^xsd:boolean ;
+	.
+

catalog/kb-all_validation-unstable-2.0.0.ttl

@@ -0,0 +1,11 @@
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+[]
+	a sh:ValidationReport ;
+	sh:conforms "true"^^xsd:boolean ;
+	.
+

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) \

dependencies/.gitignore

@@ -1,2 +1,4 @@
 CASE-develop.ttl
+CASE-develop-2.0.0.ttl
 CASE-unstable.ttl
+CASE-unstable-2.0.0.ttl

dependencies/CASE-develop-2.0.0

@@ -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 \