Merge branch 'develop' into export_local_uuid

Author: ajnelson-nist

.github/workflows/cicd.yml

@@ -16,13 +16,15 @@ name: Continuous Integration
 
 on:
   push:
-    branches: 
+    branches:
       - main
       - develop
+      - support-*
   pull_request:
-    branches: 
+    branches:
       - main
       - develop
+      - support-*
   release:
     types:
       - published
@@ -35,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: 
+        python-version:
           - '3.9'
           - '3.12'
 
@@ -57,7 +59,7 @@ jobs:
       run: make clean
     - name: Run tests
       run: make PYTHON3=python check
-    
+
     # Build the binary wheel as well as the source tar
     - name: Build Objects
       run: |

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.12.0
+    rev: 23.12.1
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.1
+    rev: 5.13.2
     hooks:
       - id: isort
         name: isort (python)

case_utils/__init__.py

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

case_utils/case_validate/validate_utils.py

@@ -197,6 +197,7 @@ 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",
         "ontologyIRI-versionIRI-prerequisite-shape",
         "versionIRI-nodeKind-shape",

case_utils/local_uuid.py

@@ -18,7 +18,7 @@
 This library was a wrapper for uuid, provided to generate repeatable UUIDs if requested.  It is now a temporary re-export of functionality migrated to cdo_local_uuid.
 """
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 
 __all__ = ["configure", "local_uuid"]
 

tests/case_utils/case_validate/uco_test_examples/Makefile

@@ -18,9 +18,7 @@ SHELL := /bin/bash
 
 top_srcdir := $(shell cd ../../../.. ; pwd)
 
-case_srcdir := $(top_srcdir)/dependencies/CASE
-
-uco_srcdir := $(case_srcdir)/dependencies/UCO
+uco_srcdir := $(top_srcdir)/dependencies/CASE/dependencies/UCO
 
 examples_srcdir := $(uco_srcdir)/tests/examples
 
@@ -102,6 +100,37 @@ all: \
 	rm __$@
 	mv _$@ $@
 
+# NOTE - this more-specific recipe enables "tbox" review, but otherwise
+# matches the wildcarded recipe.
+rdf_list_XFAIL_validation.ttl: \
+  $(examples_srcdir)/rdf_list_XFAIL.json \
+  $(tests_srcdir)/.venv.done.log \
+  $(top_srcdir)/.ontology.done.log \
+  $(top_srcdir)/case_utils/case_validate/__init__.py \
+  $(top_srcdir)/case_utils/case_validate/validate_types.py \
+  $(top_srcdir)/case_utils/case_validate/validate_utils.py \
+  $(top_srcdir)/case_utils/ontology/__init__.py
+	source $(tests_srcdir)/venv/bin/activate \
+	  && case_validate \
+	    --allow-warnings \
+	    --debug \
+	    --format turtle \
+	    --review-tbox \
+	    $< \
+	    > __$@ \
+	    ; rc=$$? ; test 0 -eq $$rc -o 1 -eq $$rc
+	@#Fail if output is empty.
+	@test -s __$@ \
+	  || exit 1
+	java -jar $(RDF_TOOLKIT_JAR) \
+	  --inline-blank-nodes \
+	  --source __$@ \
+	  --source-format turtle \
+	  --target _$@ \
+	  --target-format turtle
+	rm __$@
+	mv _$@ $@
+
 # NOTE - this more-specific recipe enables "tbox" review, but otherwise
 # matches the wildcarded recipe.
 owl_properties_XFAIL_validation.ttl: \