projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14325: Merge branch 'master'
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
arvjob.py
diff --git
a/sdk/cwl/arvados_cwl/arvjob.py
b/sdk/cwl/arvados_cwl/arvjob.py
index 87d6d1049a08d349d8d45b41b47a5fccb99f237c..69fe7e2a8f1b632675b16eeb3f6ad07ee76c00e8 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvjob.py
+++ b/
sdk/cwl/arvados_cwl/arvjob.py
@@
-2,6
+2,10
@@
#
# SPDX-License-Identifier: Apache-2.0
#
# SPDX-License-Identifier: Apache-2.0
+from past.builtins import basestring
+from builtins import object
+from future.utils import viewitems
+
import logging
import re
import copy
import logging
import re
import copy
@@
-243,7
+247,7
@@
class ArvadosJob(JobBase):
api_client=self.arvrunner.api,
keep_client=self.arvrunner.keep_client,
num_retries=self.arvrunner.num_retries)
api_client=self.arvrunner.api,
keep_client=self.arvrunner.keep_client,
num_retries=self.arvrunner.num_retries)
- log = logc.open(l
ogc.keys(
)[0])
+ log = logc.open(l
ist(logc.keys()
)[0])
dirs = {
"tmpdir": "/tmpdir",
"outdir": "/outdir",
dirs = {
"tmpdir": "/tmpdir",
"outdir": "/outdir",
@@
-343,7
+347,7
@@
class RunnerJob(Runner):
find_or_create=self.enable_reuse
).execute(num_retries=self.arvrunner.num_retries)
find_or_create=self.enable_reuse
).execute(num_retries=self.arvrunner.num_retries)
- for k,v in
job_spec["script_parameters"].items(
):
+ for k,v in
viewitems(job_spec["script_parameters"]
):
if v is False or v is None or isinstance(v, dict):
job_spec["script_parameters"][k] = {"value": v}
if v is False or v is None or isinstance(v, dict):
job_spec["script_parameters"][k] = {"value": v}