[ARVADOS] updated: 1.1.4-421-g05fe77ea6

Git user git at public.curoverse.com
Fri Jun 15 17:03:02 EDT 2018


Summary of changes:
 sdk/cwl/arvados_cwl/arvworkflow.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

       via  05fe77ea63bdbd7cc245301d2891f14456f2b5a0 (commit)
      from  3bf756a35827ed8f7e0c18b5496031cdfeb8157e (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 05fe77ea63bdbd7cc245301d2891f14456f2b5a0
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Jun 15 16:58:50 2018 -0400

    13627: Fix ArvadosWorkflow use of Builder
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py
index 5939b0413..b802e9e16 100644
--- a/sdk/cwl/arvados_cwl/arvworkflow.py
+++ b/sdk/cwl/arvados_cwl/arvworkflow.py
@@ -187,11 +187,10 @@ class ArvadosWorkflow(Workflow):
 
 
             if self.dynamic_resource_req:
-                builder = Builder()
-                builder.job = joborder
-                builder.requirements = self.requirements
-                builder.hints = self.hints
-                builder.resources = {}
+                builder = Builder(joborder,
+                                  requirements=self.requirements,
+                                  hints=self.hints,
+                                  resources={})
 
                 # Evaluate dynamic resource requirements using current builder
                 rs = copy.copy(self.static_resource_req)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list