projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15028-cwl-v1.1' refs #15028
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
crunch_script.py
diff --git
a/sdk/cwl/arvados_cwl/crunch_script.py
b/sdk/cwl/arvados_cwl/crunch_script.py
index fc2d0e8767faadf727a5332e91d6ff1b0ebb569e..c886550d41606e60e04f0142e55519e5ea33c89a 100644
(file)
--- a/
sdk/cwl/arvados_cwl/crunch_script.py
+++ b/
sdk/cwl/arvados_cwl/crunch_script.py
@@
-1,4
+1,3
@@
-from past.builtins import basestring
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: Apache-2.0
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: Apache-2.0
@@
-11,6
+10,9
@@
from past.builtins import basestring
# tool. When the workflow completes, record the output object in an output
# collection for this runner job.
# tool. When the workflow completes, record the output object in an output
# collection for this runner job.
+from past.builtins import basestring
+from future.utils import viewitems
+
import arvados
import arvados_cwl
import arvados.collection
import arvados
import arvados_cwl
import arvados.collection
@@
-62,7
+64,7
@@
def run():
if "location" in v:
v["location"] = keeppath(v["location"])
if "location" in v:
v["location"] = keeppath(v["location"])
- for k,v in
list(job_order_object.items()
):
+ for k,v in
viewitems(job_order_object
):
if isinstance(v, basestring) and arvados.util.keep_locator_pattern.match(v):
job_order_object[k] = {
"class": "File",
if isinstance(v, basestring) and arvados.util.keep_locator_pattern.match(v):
job_order_object[k] = {
"class": "File",