Merge branch 'release-0.2.2'

CHANGELOG.rst

@@ -5,6 +5,14 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to `Semantic Versioning <http://semver.org/>`_.
 
+0.2.2
+*****
+
+Fixed
+-----
+
+* Improved network error handling
+
 0.2.1
 *****
 

cerise/back_end/execution_manager.py

@@ -278,9 +278,9 @@ def _process_jobs(self, check_remote: bool) -> bool:
                 self._logger.debug('System exception while processing job:'
                                    ' {}'.format(e))
                 if isinstance(e, IOError) or isinstance(e, OSError):
-                    if ('Socket' not in e.args[1] and
-                        'Network' not in e.args[1] and
-                        'Temporary' not in e.args[1]):
+                    if ('Socket' not in str(e) and
+                        'Network' not in str(e) and
+                        'Temporary' not in str(e)):
                         job.error('An IO error occurred while uploading the job'
                             ' input data: {}. Please check that your network'
                             ' connection works, and that you have enough'

docs/source/conf.py

@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.1'
+version = '0.2.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.1'
+release = '0.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

requirements.txt

@@ -1,4 +1,4 @@
-cerulean >= 0.3.4
+cerulean >= 0.3.5
 connexion == 1.0.129
 gevent >= 0.13
 gunicorn >= 19.7.1

setup.py

@@ -8,7 +8,7 @@ def read(fname):
 
 setup(
     name = "cerise",
-    version = "0.2.1",
+    version = "0.2.2",
     author = "Lourens Veen",
     author_email = "[email protected]",
     description = ("A simple CWL job running service"),