[ARVADOS] updated: 1.3.0-410-ge231fef37

Git user git at public.curoverse.com
Thu Feb 28 15:34:52 EST 2019


Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py     |  6 ++++--
 sdk/cwl/arvados_cwl/arvcontainer.py | 14 ++++++++------
 sdk/cwl/arvados_cwl/arvdocker.py    |  1 +
 sdk/cwl/arvados_cwl/arvjob.py       | 10 ++++++----
 sdk/cwl/arvados_cwl/executor.py     | 18 +++++++++++-------
 sdk/cwl/arvados_cwl/fsaccess.py     |  4 ++--
 sdk/cwl/arvados_cwl/runner.py       |  4 ++--
 7 files changed, 34 insertions(+), 23 deletions(-)

       via  e231fef37079916d0dc6babf93d669d474598ced (commit)
       via  f1943e92b2c83d2884eeaa2829f1b4a07d23b9ee (commit)
       via  50ecc8767d360670b0f8906da4daa87e56779e54 (commit)
       via  6ab33cb91de748f4f8ec8e12377f0b0650804db1 (commit)
       via  0fc8778c47397f7e5de8481e0a3e7716ccc53d21 (commit)
       via  e7ce0cd2e144e9139cdbdaaab364803039627922 (commit)
      from  1c35232248baebeaa69e7e99d9827e7b9983fe6c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e231fef37079916d0dc6babf93d669d474598ced
Merge: 1c3523224 f1943e92b
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Thu Feb 28 15:33:38 2019 -0500

    Merge branch '9865-cwl-fix-ignored-exceptions'
    
    refs #9865
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>


commit f1943e92b2c83d2884eeaa2829f1b4a07d23b9ee
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Thu Feb 28 15:32:48 2019 -0500

    9865: Removes trailing whitespace
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index 086e299a5..ab2078e15 100644
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -199,7 +199,7 @@ class ArvadosJob(JobBase):
                                     e)
             else:
                 logger.info("%s %s is %s", self.arvrunner.label(self), response["uuid"], response["state"])
-        except Exception: 
+        except Exception:
             logger.exception("%s error" % (self.arvrunner.label(self)))
             self.output_callback({}, "permanentFail")
 
diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index a85e99e05..c1f2b5474 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -734,7 +734,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
                 logger.error("Interrupted, workflow will be cancelled")
             elif isinstance(sys.exc_info()[1], WorkflowException):
                 logger.error("Workflow execution failed:\n%s", sys.exc_info()[1], exc_info=(sys.exc_info()[1] if self.debug else False))
-            else: 
+            else:
                 logger.exception("Workflow execution failed")
 
             if self.pipeline:

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list