Merge branch 'master' into make_base_abc

Author: gijzelaerr

.dockerignore

@@ -10,3 +10,4 @@ casa.log
 notebooks/
 __pycache__
 .eggs/
+data/

Makefile

@@ -7,11 +7,12 @@ VENV=$(CURDIR)/.venv2
 all: run
 
 $(VENV):
-	virtualenv -p python2 ../.venv2
+	virtualenv -p python2 $(VENV)
 
 $(VENV)/bin/cwltool: $(VENV)
-	$(VENV)/bin/pip install ..
-	$(VENV)/bin/pip install -r requirements.txt
+	$(VENV)/bin/pip install .
+	$(VENV)/bin/pip install -r cwl/requirements.txt
+	$(VENV)/bin/pip install -r test/requirements.txt
 
 docker:
 	docker build . -t apertif/apercal
@@ -24,5 +25,5 @@ data/small: data/${FILE}
 	cd data && tar zmxvf ${FILE}
 
 run: $(VENV)/bin/cwltool data/small
-	$(VENV)/bin/cwltool --enable-ext --outdir=cwl/outdir cwl/apercal.cwl cwl/job.yaml
+	$(VENV)/bin/cwltool --enable-ext  --no-compute-checksum --outdir=cwl/outdir cwl/apercal.cwl cwl/job.yaml
 

apercal/libs/lib.py

@@ -144,7 +144,7 @@ def run_casa(cmd, raise_on_severe=False, timeout=1800):
     casa = drivecasa.Casapy()
     try:
         casa_output, casa_error = casa.run_script(cmd, raise_on_severe=True, timeout=timeout)
-        logger.debug('\n'.join(casa_output))
+        logger.debug('\n'.join(casa_error))
     except RuntimeError:
         logger.error("Casa command failed")
         if raise_on_severe: