Merge branch 'dev' into deploy

biosimulators_test_suite/_version.py

@@ -1 +1 @@
-__version__ = '0.1.80'
+__version__ = '0.1.81'

biosimulators_test_suite/test_case/log.py

@@ -17,6 +17,7 @@
 import os
 import requests
 import requests.exceptions
+import simplejson.errors
 import yaml
 
 __all__ = [
@@ -87,13 +88,17 @@ def eval_outputs(self, specifications, synthetic_archive, synthetic_sed_docs, ou
                     'The simulation log is invalid. Documentation about the log format is available at '
                     'https://docs.biosimulations.org/concepts/conventions/simulation-run-logs/ and https://api.biosimulations.org.'
                 )
-                error = response.json()['error'][0]
 
-                pointer = error.get('source', {}).get('pointer', None)
-                if pointer:
-                    msg += '\n\nSource: ' + pointer
+                try:
+                    error = response.json()['error'][0]
 
-                msg += '\n\n' + error['detail']
+                    pointer = error.get('source', {}).get('pointer', None)
+                    if pointer:
+                        msg += '\n\nSource: ' + pointer
+
+                    msg += '\n\n' + error['detail']
+                except simplejson.errors.JSONDecodeError:
+                    msg += '\n\n{}: {}'.format(response.status_code, response.text)
 
                 raise InvalidOutputsException(msg)
 

requirements.txt

@@ -5,4 +5,5 @@ natsort
 PyPDF2
 python_dateutil
 pyyaml
+simplejson
 termcolor