Merge pull request #23 from casework/cleanup

Cleanup

Author: ajnelson-nist

Makefile

@@ -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),)
@@ -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

case_utils/case_sparql_select/__init__.py

@@ -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

dependencies/CASE-Examples-QC

@@ -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
@@ -52,7 +52,6 @@ all: \
 	      .
 	touch $@
 
-
 all-case_utils: \
   .venv.done.log
 	$(MAKE) \

tests/Makefile

@@ -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),)