From 8e98801032f2c165e39f5ca1151bd6721219aa6b Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 18 Nov 2022 17:36:07 -0500 Subject: [PATCH 1/2] Clear TODO tied to ONT-445 Tested by running `rm case_utils/ontology/case-1.0.0.ttl ; make clean ; make -j check`. No effects were observed on Make-managed files. References: * [ONT-445] (CP-38) rdf-toolkit base-iri flag degenerates versionIRI when slash IRI form is used Signed-off-by: Alex Nelson --- case_utils/ontology/Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/case_utils/ontology/Makefile b/case_utils/ontology/Makefile index 44cec68..ab8a65d 100644 --- a/case_utils/ontology/Makefile +++ b/case_utils/ontology/Makefile @@ -39,14 +39,9 @@ case-$(case_version).ttl: \ test ! -d $(uco_srcdir)/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/build \ || rm -rf \ $(uco_srcdir)/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/build - #TODO This normalization step will not be needed after resolution of ONT-445. - java -jar $(RDF_TOOLKIT_JAR) \ - --inline-blank-nodes \ - --source $(case_srcdir)/tests/case_monolithic.ttl \ - --source-format turtle \ - --target _$@ \ - --target-format turtle - mv _$@ $@ + cp \ + $(case_srcdir)/tests/case_monolithic.ttl \ + $@ case-$(case_version)-subclasses.ttl: \ case-$(case_version).ttl \ From 3c9bd824e93be9b680188d224f74bcf885ab00a3 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 18 Nov 2022 17:38:17 -0500 Subject: [PATCH 2/2] Clear TODO tied to completed tool release Tested by running `rm case_utils/ontology/case-1.0.0.ttl ; make clean ; make -j check`. No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- case_utils/ontology/Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/case_utils/ontology/Makefile b/case_utils/ontology/Makefile index ab8a65d..ad2576a 100644 --- a/case_utils/ontology/Makefile +++ b/case_utils/ontology/Makefile @@ -35,10 +35,6 @@ case-$(case_version).ttl: \ $(MAKE) \ --directory $(case_srcdir)/tests \ case_monolithic.ttl - #TODO This cleanup step should be removed after the 0.3.0 release of CASE-Utility-SHACL-Inheritance-Reviewer. - test ! -d $(uco_srcdir)/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/build \ - || rm -rf \ - $(uco_srcdir)/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/build cp \ $(case_srcdir)/tests/case_monolithic.ttl \ $@ @@ -54,10 +50,6 @@ case-$(case_version)-subclasses.ttl: \ $(MAKE) \ --directory $(case_srcdir)/tests \ .venv.done.log - #TODO This cleanup step should be removed after the 0.3.0 release of CASE-Utility-SHACL-Inheritance-Reviewer. - test ! -d $(uco_srcdir)/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/build \ - || rm -rf \ - $(uco_srcdir)/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/build source $(case_srcdir)/tests/venv/bin/activate \ && python3 src/subclasses_ttl.py \ __$@ \