From fe349ef334f643faf08fe35b4f1da87e82fa1bbf Mon Sep 17 00:00:00 2001 From: John Chilton Date: Mon, 17 Dec 2018 13:54:24 -0500 Subject: [PATCH] Remove __collected_datasets__ from hook dict. Added for Tool subclass hooks in ca8cc1420ef80bd2fef17fa9bb21dbb0714b4a88 but doesn't seem to be used in any tool implementation hooks. --- lib/galaxy/jobs/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py index 95474dbcf02..81568791562 100644 --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -1441,11 +1441,9 @@ class JobWrapper(HasResourceParameters): # why not re-use self.param_dict here? param_dict = dict([(p.name, p.value) for p in job.parameters]) param_dict = self.tool.params_from_strings(param_dict, self.app) - # Create generated output children and primary datasets and add to param_dict + # Create generated output children and primary datasets and dynamic outputs. tool_working_directory = self.tool_working_directory - collected_datasets = { - 'primary': self.tool.collect_primary_datasets(out_data, self.get_tool_provided_job_metadata(), tool_working_directory, input_ext, input_dbkey) - } + self.tool.collect_primary_datasets(out_data, self.get_tool_provided_job_metadata(), tool_working_directory, input_ext, input_dbkey) self.tool.collect_dynamic_outputs( out_collections, self.get_tool_provided_job_metadata(), @@ -1454,7 +1452,6 @@ class JobWrapper(HasResourceParameters): job=job, input_dbkey=input_dbkey, ) - param_dict.update({'__collected_datasets__': collected_datasets}) # Certain tools require tasks to be completed after job execution # ( this used to be performed in the "exec_after_process" hook, but hooks are deprecated ). self.tool.exec_after_process(self.app, inp_data, out_data, param_dict, job=job)