From 853963c67c20a2d7c368638dc2475c53a110baf6 Mon Sep 17 00:00:00 2001
From: aknecht2 <aknecht2@unl.edu>
Date: Fri, 28 Apr 2017 13:24:58 -0500
Subject: [PATCH] Fixed some minor bugs in workflow_module. Jobs before splits
were not getting loaded correctly.
---
chipathlon/workflow_module.py | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/chipathlon/workflow_module.py b/chipathlon/workflow_module.py
index 130e208..f8ead4b 100644
--- a/chipathlon/workflow_module.py
+++ b/chipathlon/workflow_module.py
@@ -159,7 +159,7 @@ class WorkflowModule(object):
for item in yaml_data:
for key in item.keys():
if key in self.workflow_jobs:
- return
+ pass
elif "[" in key and "]" in key:
val, marker, dummy = re.split("[\[\]]", key)
if marker not in self.markers:
@@ -167,7 +167,7 @@ class WorkflowModule(object):
self.order.append(marker)
if val not in self.markers[marker]:
self.markers[marker].append(val)
- self._load_markers(item[key])
+ self._load_markers(item[key])
return
def get_job_params(self, markers, job_name):
@@ -407,15 +407,16 @@ class WorkflowModule(object):
for i, job_dict in enumerate(job_list):
job_name = job_dict.keys()[0]
job_info = job_dict[job_name]
- for file_dict in job_info["outputs"]:
- file_name = file_dict.keys()[0]
- file_info = file_dict[file_name]
- if file_info.get("final_result"):
- final_results.append({
- "job_names": [job.keys()[0] for job in job_list[:i + 1]],
- "file_info": file_info,
- "file_name": file_name
- })
+ if job_info.get("outputs"):
+ for file_dict in job_info["outputs"]:
+ file_name = file_dict.keys()[0]
+ file_info = file_dict[file_name]
+ if file_info.get("final_result"):
+ final_results.append({
+ "job_names": [job.keys()[0] for job in job_list[:i + 1]],
+ "file_info": file_info,
+ "file_name": file_name
+ })
return final_results
def _setup_job_params(self, master_files, job_info, markers, param_type, arg_params, outputs):
--
GitLab