[ARVADOS] updated: 1.3.0-166-g57b450aee

Git user git at public.curoverse.com
Fri Jan 18 08:26:07 EST 2019


Summary of changes:
 sdk/cwl/arvados_cwl/executor.py | 2 +-
 sdk/cwl/arvados_cwl/runner.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  57b450aee36a60b2ad0be0a073250e2badbbda8d (commit)
      from  9d6a7e96d03d1468a992f1b4038de970d40f3c78 (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 57b450aee36a60b2ad0be0a073250e2badbbda8d
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Thu Jan 17 16:03:03 2019 -0500

    13306: Removing list wrapping added by futurize to PathMapper objects
    
    Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti at veritasgenetics.com>
    
    Because cwltool.PathMapper objects have a function called items(), futurize incorrectly added the results of calls to items() to a list object (thinking it was a call to dict.items()). In fact, cwltool.PathMapper.items() already returns a list.

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index cf46401b3..c6c2c8713 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -435,7 +435,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
                                               keep_client=self.keep_client,
                                               num_retries=self.num_retries)
 
-        for k,v in list(generatemapper.items()):
+        for k,v in generatemapper.items():
             if k.startswith("_:"):
                 if v.type == "Directory":
                     continue
diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 2a86a0556..b65e2c58e 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -318,7 +318,7 @@ def upload_workflow_deps(arvrunner, tool):
                                      discovered_secondaryfiles=discovered_secondaryfiles)
             document_loader.idx[deptool["id"]] = deptool
             toolmap = {}
-            for k,v in list(pm.items()):
+            for k,v in pm.items():
                 toolmap[k] = v.resolved
             merged_map[deptool["id"]] = FileUpdates(toolmap, discovered_secondaryfiles)
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list