Skip to content

Cleanup#23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ajnelson-nist merged 5 commits into from
Nov 10, 2021
Merged

Cleanup #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
844eeab
Bump CASE-Examples-QC pointer
ajnelson-nist Nov 10, 2021
12b26b8
Clean whitespace
ajnelson-nist Nov 10, 2021
d360c7b
Sort imports
ajnelson-nist Nov 10, 2021
b393a37
Use one rdf-toolkit.jar
ajnelson-nist Nov 10, 2021
edeff21
Reduce Python 3 detection
ajnelson-nist Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@

SHELL := /bin/bash

PYTHON3 ?= $(shell which python3.9 2>/dev/null || which python3.8 2>/dev/null || which python3.7 2>/dev/null || which python3.6 2>/dev/null || which python3)
PYTHON3 ?= python3

case_version := $(shell $(PYTHON3) case_utils/ontology/version_info.py)
ifeq ($(case_version),)
Expand All@@ -37,7 +37,8 @@ all: \
# Build an ontology terms list, which has a side effect of initiating further submodules.
$(MAKE) \
--directory dependencies/CASE-Examples-QC \
download
.git_submodule_init.done.log \
.venv.done.log
$(MAKE) \
--directory dependencies/CASE-Examples-QC/tests \
ontology_vocabulary.txt
Expand Down
2 changes: 1 addition & 1 deletion case_utils/case_sparql_select/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,8 +30,8 @@

import argparse
import binascii
import os
import logging
import os

import pandas as pd # type: ignore
import rdflib.plugins.sparql # type: ignore
Expand Down
2 changes: 1 addition & 1 deletion dependencies/CASE-Examples-QC
Open in desktop
Submodule CASE-Examples-QC updated 16 files
+1 −1 dependencies/CASE-Examples
+1 −1 dependencies/casework.github.io
+1 −1 tests/CASE-Examples/examples/illustrations/Oresteia/used_concepts.txt
+2 −2 tests/CASE-Examples/examples/illustrations/README.md
+1 −1 tests/CASE-Examples/examples/illustrations/accounts/used_concepts.txt
+0 −1 tests/CASE-Examples/examples/illustrations/file/undefined_concepts.txt
+0 −1 tests/CASE-Examples/examples/illustrations/file/used_concepts.txt
+1 −0 tests/CASE-Examples/examples/illustrations/reconstructed_file/used_concepts.txt
+0 −1 tests/CASE-Examples/examples/illustrations/undefined_concepts.txt
+1 −2 tests/CASE-Examples/examples/illustrations/used_concepts.txt
+2 −2 tests/CASE-Examples/examples/illustrations/wc_l_undefined_concepts.txt
+2 −1 tests/casework.github.io/examples/owl_trafficking/used_concepts.txt
+2 −1 tests/casework.github.io/examples/urgent_evidence/used_concepts.txt
+3 −1 tests/casework.github.io/examples/used_concepts.txt
+0 −1 tests/undefined_concepts.txt
+3 −2 tests/used_concepts.txt
3 changes: 1 addition & 2 deletions tests/Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ SHELL := /bin/bash

top_srcdir := $(shell cd .. ; pwd)

PYTHON3 ?= $(shell which python3.9 2>/dev/null || which python3.8 2>/dev/null || which python3.7 2>/dev/null || which python3.6 2>/dev/null || which python3)
PYTHON3 ?= python3

all: \
all-case_utils
Expand DownExpand Up@@ -52,7 +52,6 @@ all: \
.
touch $@


all-case_utils: \
.venv.done.log
$(MAKE) \
Expand Down
4 changes: 3 additions & 1 deletion tests/case_utils/case_file/Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,11 @@ top_srcdir := $(shell cd ../../.. ; pwd)

tests_srcdir := $(top_srcdir)/tests

case_srcdir := $(top_srcdir)/dependencies/CASE

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

RDF_TOOLKIT_JAR := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/CASE-0.3.0/CASE/lib/rdf-toolkit.jar
RDF_TOOLKIT_JAR := $(case_srcdir)/lib/rdf-toolkit.jar

COMM ?= $(shell which gcomm 2>/dev/null || which comm)
ifeq ($(COMM),)
Expand Down