[ARVADOS] updated: 1.3.0-228-g7e1c8ea79
Git user
git at public.curoverse.com
Thu Jan 31 12:16:52 EST 2019
Summary of changes:
sdk/cwl/arvados_cwl/arvcontainer.py | 2 +-
sdk/cwl/arvados_cwl/arvjob.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
via 7e1c8ea79a19d5f756f8549474547da52137ce6d (commit)
from 7d4da75d3980d465053c44b4d5b16afe166912a6 (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 7e1c8ea79a19d5f756f8549474547da52137ce6d
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date: Thu Jan 31 12:16:42 2019 -0500
13306: Fixes futurize mistakes regarding PathMapper items()
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <eric.biagiotti at gmail.com>
diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index a45321d37..e921b26df 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -140,7 +140,7 @@ class ArvadosContainer(JobBase):
generatemapper = NoFollowPathMapper(self.generatefiles["listing"], "", "",
separateDirs=False)
- sorteditems = sorted(list(generatemapper.items()), key=lambda n: n[1].target)
+ sorteditems = sorted(generatemapper.items(), key=lambda n: n[1].target)
logger.debug("generatemapper is %s", sorteditems)
diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index bdf798d30..69fe7e2a8 100644
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -75,7 +75,7 @@ class ArvadosJob(JobBase):
separateDirs=False)
with Perf(metrics, "createfiles %s" % self.name):
- for f, p in list(generatemapper.items()):
+ for f, p in generatemapper.items():
if p.type == "CreateFile":
with vwd.open(p.target, "w") as n:
n.write(p.resolved.encode("utf-8"))
@@ -89,7 +89,7 @@ class ArvadosJob(JobBase):
trash_at=info["trash_at"],
properties=info["properties"])
- for f, p in list(generatemapper.items()):
+ for f, p in generatemapper.items():
if p.type == "File":
script_parameters["task.vwd"][p.target] = p.resolved
if p.type == "CreateFile":
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list