Skip to content

Commit b0a0d78

Browse files
committed
Drop CASE-Examples-QC as submodule
This removes a circular submodule dependency, but also removes a concept typo-check function. Long-term resolution is left for discusion at Issue 40. References: * #40 Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
1 parent f174764 commit b0a0d78

File tree

5 files changed

+2
-58
lines changed

5 files changed

+2
-58
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "dependencies/CASE"]
22
path = dependencies/CASE
33
url = https://github.com/casework/CASE.git
4-
[submodule "dependencies/CASE-Examples-QC"]
5-
path = dependencies/CASE-Examples-QC
6-
url = https://github.com/ajnelson-nist/CASE-Examples-QC.git

Makefile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@ all: \
3232
cd dependencies \
3333
&& git diff . \
3434
| cat
35-
git submodule init dependencies/CASE-Examples-QC
36-
git submodule update dependencies/CASE-Examples-QC
37-
# Build an ontology terms list, which has a side effect of initiating further submodules.
38-
$(MAKE) \
39-
--directory dependencies/CASE-Examples-QC \
40-
.git_submodule_init.done.log \
41-
.venv.done.log
42-
$(MAKE) \
43-
--directory dependencies/CASE-Examples-QC/tests \
44-
ontology_vocabulary.txt
4535
test -r dependencies/CASE/ontology/master/case.ttl \
4636
|| (git submodule init dependencies/CASE && git submodule update dependencies/CASE)
4737
test -r dependencies/CASE/ontology/master/case.ttl
@@ -91,10 +81,6 @@ clean:
9181
tests/examples \
9282
|| true \
9383
)
94-
@#Remove flag files that are normally set after deeper submodules and rdf-toolkit are downloaded.
95-
@rm -f \
96-
dependencies/CASE-Examples-QC/.git_submodule_init.done.log \
97-
dependencies/CASE-Examples-QC/.lib.done.log
9884

9985
# This recipe guarantees timestamp update order, and is otherwise intended to be a no-op.
10086
dependencies/CASE/ontology/master/case.ttl: \

dependencies/CASE-Examples-QC

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/case_utils/case_file/Makefile

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,18 @@ tests_srcdir := $(top_srcdir)/tests
1919

2020
case_srcdir := $(top_srcdir)/dependencies/CASE
2121

22-
qc_srcdir := $(top_srcdir)/dependencies/CASE-Examples-QC
23-
2422
RDF_TOOLKIT_JAR := $(case_srcdir)/lib/rdf-toolkit.jar
2523

26-
COMM ?= $(shell which gcomm 2>/dev/null || which comm)
27-
ifeq ($(COMM),)
28-
$(error comm not found)
29-
endif
30-
31-
SORT ?= $(shell which gsort 2>/dev/null || which sort)
32-
ifeq ($(SORT),)
33-
$(error sort not found)
34-
endif
35-
3624
all: \
3725
kb.json \
3826
sample.txt.json \
39-
sample.txt-nocompact.json \
40-
undefined_vocabulary.txt
27+
sample.txt-nocompact.json
4128

4229
check: \
4330
kb.json \
4431
kb_validation.ttl \
4532
sample.txt.json \
46-
sample.txt-nocompact.json \
47-
undefined_vocabulary.txt
48-
test ! -s undefined_vocabulary.txt \
49-
|| (echo "ERROR:tests/case_file/Makefile:The output in kb.json has undefined CASE or UCO terms. The first few are:" >&2 && head undefined_vocabulary.txt >&2 && exit 1)
33+
sample.txt-nocompact.json
5034
source $(tests_srcdir)/venv/bin/activate \
5135
&& pytest \
5236
--log-level=DEBUG
@@ -224,25 +208,3 @@ sample.txt-nocompact.json: \
224208
fi
225209
test ! -r _$@
226210
touch $@
227-
228-
undefined_vocabulary.txt: \
229-
kb.json \
230-
$(qc_srcdir)/src/vocabulary_used.py \
231-
$(qc_srcdir)/tests/ontology_vocabulary.txt
232-
source $(qc_srcdir)/venv/bin/activate \
233-
&& python3 $(qc_srcdir)/src/vocabulary_used.py \
234-
$< \
235-
> $@___
236-
grep ':' $@___ \
237-
| egrep -v 'w3.org' \
238-
| grep -v '/kb/' \
239-
> $@__
240-
rm $@___
241-
LC_ALL=C \
242-
$(COMM) \
243-
-13 \
244-
$(qc_srcdir)/tests/ontology_vocabulary.txt \
245-
<(LC_ALL=C $(SORT) $@__) \
246-
> $@_
247-
rm $@__
248-
mv $@_ $@

tests/case_utils/case_file/undefined_vocabulary.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)