Merge pull request #159 from casework/release-0.16.0

Release 0.16.0

Author: kchason

Makefile

@@ -116,12 +116,23 @@ clean:
 	  || $(MAKE) \
 	    --directory dependencies/CASE \
 	    clean
-	@# Restore CASE validation output files that do not affect CASE build process.
+	@# Restore CASE validation and catalog output files that do not affect CASE build process.
 	@test ! -r dependencies/CASE/README.md \
 	  || ( \
 	    cd dependencies/CASE \
 	      && git checkout \
 	        -- \
+	        ontology \
+	        tests/examples \
+	        || true \
+	  )
+	@# Restore UCO catalog output files that do not affect CASE build process.
+	@test ! -r dependencies/CASE/dependencies/UCO/README.md \
+	  || ( \
+	    cd dependencies/CASE/dependencies/UCO \
+	      && git checkout \
+	        -- \
+	        ontology \
 	        tests/examples \
 	        || true \
 	  )

README.md

@@ -122,7 +122,7 @@ case_sparql_select output.md input.sparql input.json [input-2.json ...]
 
 ### `local_uuid`
 
-_Migration:_ Functionality previously in [`case_utils.local_uuid`](case_utils/local_uuid.py) has been exported to [`cdo-local-uuid`](https://github.com/Cyber-Domain-Ontology/CDO-Utility-Local-UUID).  A future `case-utils` release will drop this re-export.
+_Migration:_ Functionality previously in [`case_utils.local_uuid`](case_utils/local_uuid.py) has been exported to [`cdo-local-uuid`](https://github.com/Cyber-Domain-Ontology/CDO-Utility-Local-UUID).
 
 
 ### Built versions

case_utils/__init__.py

@@ -14,4 +14,4 @@
 #
 # We would appreciate acknowledgement if the software is used.
 
-__version__ = "0.15.0"
+__version__ = "0.16.0"

case_utils/case_validate/validate_utils.py

@@ -14,7 +14,7 @@
 #
 # We would appreciate acknowledgement if the software is used.
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"
 
 import importlib
 import logging
@@ -197,10 +197,18 @@ def disable_tbox_review(graph: rdflib.Graph) -> None:
         "Disjointedness-AP-OP-shape",
         "Disjointedness-C-DT-shape",
         "Disjointedness-DP-OP-shape",
-        "List-shape",
         "ObjectProperty-shacl-constraints-shape",
+        "Sequence-shape",
+        "disjointUnionOf-subjects-shape",
+        "hasKey-subjects-shape",
+        "intersectionOf-subjects-shape",
+        "onProperties-subjects-shape",
+        "oneOf-subjects-shape",
         "ontologyIRI-versionIRI-prerequisite-shape",
+        "propertyChainAxiom-subjects-shape",
+        "unionOf-subjects-shape",
         "versionIRI-nodeKind-shape",
+        "withRestrictions-subjects-shape",
     }:
         n_tbox_shape = ns_uco_owl[tbox_shape_basename]
         graph.add((n_tbox_shape, NS_SH.deactivated, l_true))

case_utils/local_uuid.py

@@ -40,15 +40,30 @@ $(case_srcdir)/.venv.done.log: \
 	touch -c $@
 	test -r $@
 
+# Build monolith including transitive import closure outside of
+# CDO-maintained ontologies, removing need for network retrieval for
+# non-CDO class and property definitions.
 case-$(case_version).ttl: \
   $(case_srcdir)/.venv.done.log \
   $(RDF_TOOLKIT_JAR)
 	$(MAKE) \
 	  --directory $(case_srcdir)/tests \
 	    case_monolithic.ttl
-	cp \
-	  $(case_srcdir)/tests/case_monolithic.ttl \
-	  $@
+	source $(case_srcdir)/venv/bin/activate \
+	  && rdfpipe \
+	    --output-format turtle \
+	    $(case_srcdir)/tests/case_monolithic.ttl \
+	    $(uco_srcdir)/dependencies/collections-ontology/collections.owl \
+	    $(uco_srcdir)/dependencies/error/docs/current/error.ttl \
+	    > __$@
+	java -jar $(RDF_TOOLKIT_JAR) \
+	  --inline-blank-nodes \
+	  --source __$@ \
+	  --source-format turtle \
+	  --target _$@ \
+	  --target-format turtle
+	rm __$@
+	mv _$@ $@
 
 case-$(case_version)-subclasses.ttl: \
   case-$(case_version).ttl \

case_utils/ontology/Makefile

@@ -3,10 +3,26 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xs: <http://www.w3.org/2001/XMLSchema#> .
 
+<http://purl.org/co/Bag>
+	rdfs:subClassOf <http://purl.org/co/Collection> ;
+	.
+
+<http://purl.org/co/Collection>
+	rdfs:subClassOf owl:Thing ;
+	.
+
+<http://purl.org/co/Item>
+	rdfs:subClassOf owl:Thing ;
+	.
+
 <http://purl.org/co/ListItem>
 	rdfs:subClassOf <http://purl.org/co/Item> ;
 	.
 
+<http://purl.org/co/Set>
+	rdfs:subClassOf <http://purl.org/co/Collection> ;
+	.
+
 <https://ontology.caseontology.org/case/investigation/Attorney>
 	rdfs:subClassOf <https://ontology.unifiedcyberontology.org/uco/role/Role> ;
 	.