Skip to content

Commit

Permalink
WIP fix #1330
Browse files Browse the repository at this point in the history
  • Loading branch information
manabuishii committed Nov 11, 2021
1 parent 0209b0b commit fbed7db
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
4 changes: 4 additions & 0 deletions cwltool/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,10 @@ def _init_job(
)

job = copy.deepcopy(joborder)
if len(job.keys()) > 0:
for jo in joborder:
field = shortname(jo)
job[field] = joborder[jo]

make_fs_access = getdefault(runtime_context.make_fs_access, StdFsAccess)
fs_access = make_fs_access(runtime_context.basedir)
Expand Down
9 changes: 5 additions & 4 deletions cwltool/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,11 @@ def job(
)

step_input = {}
for inp in self.tool["inputs"]:
field = shortname(inp["id"])
if not inp.get("not_connected"):
step_input[field] = job_order[inp["id"]]
for inp in job_order:
field = shortname(inp)
step_input[field] = job_order[inp]
# if not inp.get("not_connected"):
# step_input[field] = job_order[field]

try:
yield from self.embedded_tool.job(
Expand Down
2 changes: 2 additions & 0 deletions cwltool/workflow_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@ def object_from_state(
incomplete: bool = False,
) -> Optional[CWLObjectType]:
inputobj = {} # type: CWLObjectType
for s in state.keys():
inputobj[s] = state[s].value
for inp in parms:
iid = original_id = cast(str, inp["id"])
if frag_only:
Expand Down

0 comments on commit fbed7db

Please sign in to comment.