[ARVADOS] updated: 1.3.0-162-gdb376a8dd

Git user git at public.curoverse.com
Thu Jan 17 13:50:13 EST 2019


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

       via  db376a8ddd3a803f4c9c85baf41cb57c6106452f (commit)
      from  be57c52f8ea23852d9d00ab1981b41354f59f27d (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 db376a8ddd3a803f4c9c85baf41cb57c6106452f
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Thu Jan 17 13:49:39 2019 -0500

    13306: Updating dict keys as a list to ensure py2/3 compatibility
    
    Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/done.py b/sdk/cwl/arvados_cwl/done.py
index 9c9195a6a..313c3925a 100644
--- a/sdk/cwl/arvados_cwl/done.py
+++ b/sdk/cwl/arvados_cwl/done.py
@@ -63,7 +63,7 @@ def logtail(logcollection, logfunc, header, maxlen=25):
     containersapi = ("crunch-run.txt" in logcollection)
     mergelogs = {}
 
-    for log in list(logcollection.keys()):
+    for log in list(logcollection):
         if not containersapi or log in ("crunch-run.txt", "stdout.txt", "stderr.txt"):
             logname = log[:-4]
             logt = deque([], maxlen)
@@ -77,7 +77,7 @@ def logtail(logcollection, logfunc, header, maxlen=25):
                         logt.append(l)
 
     if containersapi:
-        keys = list(mergelogs.keys())
+        keys = list(mergelogs)
         loglines = []
         while True:
             earliest = None
diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index 14ea8c534..cf46401b3 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -343,7 +343,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
                 if self.stop_polling.is_set():
                     break
                 with self.workflow_eval_lock:
-                    keys = list(self.processes.keys())
+                    keys = list(self.processes)
                 if not keys:
                     remain_wait = self.poll_interval
                     continue
diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 389750523..8bcad4828 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -175,7 +175,7 @@ def upload_dependencies(arvrunner, name, document_loader,
 
     visit_class(workflowobj, ("CommandLineTool", "Workflow"), discover_default_secondary_files)
 
-    for d in list(discovered.keys()):
+    for d in list(discovered):
         # Only interested in discovered secondaryFiles which are local
         # files that need to be uploaded.
         if d.startswith("file:"):

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list