Skip to content

Commit ac30faf

Browse files
committed
Revert rdf-toolkit-action usage
An issue was discovered with rdf-toolkit being used multiple times in succession on a file, via testing with the CASE-Examples repository. To avoid this issue causing an impact in this repository, the rdf-toolkit action is being reverted. References: * casework/CASE-Examples#75 Signed-off-by: Alex Nelson <[email protected]>
1 parent ee567d2 commit ac30faf

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

.pre-commit-config.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ repos:
1414
rev: 22.3.0
1515
hooks:
1616
- id: black
17-
- repo: https://github.com/kchason/rdf-toolkit-action
18-
rev: 0.1.2
19-
hooks:
20-
- id: rdf-toolkit-normalizer
21-
args:
22-
- --autofix
2317
- repo: https://github.com/pycqa/flake8
2418
rev: 4.0.1
2519
hooks:

tests/CASE-Examples/examples/illustrations/src/illustration.mk

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ subjectdir_basename := $(shell basename $$PWD)
1919

2020
qc_srcdir := $(top_srcdir)/dependencies/CASE-Examples-QC
2121

22-
case_srcdir := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/CASE-Utilities-Python/dependencies/CASE
23-
2422
example_srcdir := $(qc_srcdir)/dependencies/CASE-Examples/examples/illustrations/$(subjectdir_basename)
2523

24+
rdf_toolkit_jar := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/UCO-develop/lib/rdf-toolkit.jar
25+
2626
subject_json := $(example_srcdir)/$(subjectdir_basename).json
2727

2828
sparql_files := $(wildcard $(top_srcdir)/case_prov/queries/construct-*.sparql)
@@ -55,8 +55,15 @@ $(subjectdir_basename)-prov.ttl: \
5555
&& case_prov_rdf \
5656
--allow-empty-results \
5757
--debug \
58-
_$@ \
58+
__$@ \
5959
$<
60+
java -jar $(rdf_toolkit_jar) \
61+
--inline-blank-nodes \
62+
--source __$@ \
63+
--source-format turtle \
64+
--target _$@ \
65+
--target-format turtle
66+
rm __$@
6067
mv _$@ $@
6168

6269
$(subjectdir_basename)-prov_activities.dot: \

tests/casework.github.io/examples/src/example.mk

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ subjectdir_basename := $(shell basename $$PWD)
1919

2020
qc_srcdir := $(top_srcdir)/dependencies/CASE-Examples-QC
2121

22-
case_srcdir := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/CASE-Utilities-Python/dependencies/CASE
23-
2422
example_srcdir := $(qc_srcdir)/dependencies/casework.github.io/examples/$(subjectdir_basename)
2523

24+
rdf_toolkit_jar := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/UCO-develop/lib/rdf-toolkit.jar
25+
2626
subject_json := $(example_srcdir)/$(subjectdir_basename).json
2727

2828
sparql_files := $(wildcard $(top_srcdir)/case_prov/queries/construct-*.sparql)
@@ -54,8 +54,15 @@ $(subjectdir_basename)-prov.ttl: \
5454
&& case_prov_rdf \
5555
--allow-empty-results \
5656
--debug \
57-
_$@ \
57+
__$@ \
5858
$<
59+
java -jar $(rdf_toolkit_jar) \
60+
--inline-blank-nodes \
61+
--source __$@ \
62+
--source-format turtle \
63+
--target _$@ \
64+
--target-format turtle
65+
rm __$@
5966
mv _$@ $@
6067

6168
$(subjectdir_basename)-prov-activities.dot: \

0 commit comments

Comments
 (0)