From c72aeabee38ad8408734031a26e909ed54ca7cec Mon Sep 17 00:00:00 2001 From: George Marchment <georgemarchment@yahoo.fr> Date: Tue, 26 Mar 2024 10:21:58 +0100 Subject: [PATCH] fix weird bug where processes defined previously were kept --- src/nextflow_file.py | 10 ++++++---- src/workflow.py | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/nextflow_file.py b/src/nextflow_file.py index f23e39a..ca7d93c 100644 --- a/src/nextflow_file.py +++ b/src/nextflow_file.py @@ -296,11 +296,13 @@ class Nextflow_File(Nextflow_Building_Blocks): raise Exception(f"Process '{name}' couldn't be found in '{self.get_file_address()}'") - def get_processes_defined(self, tab = []): - tab+= super().get_processes() + def get_processes_defined(self, dict = {}): + processes = self.get_processes() + for p in processes: + dict[p] = [] for include in self.includes: - tab+=include.get_file().get_processes_defined() - return list(set(tab)) + _ = include.get_file().get_processes_defined(dict = dict) + return dict def get_processes_called(self, tab = []): diff --git a/src/workflow.py b/src/workflow.py index e1914c6..3d2021d 100644 --- a/src/workflow.py +++ b/src/workflow.py @@ -225,7 +225,8 @@ class Workflow: self.nextflow_file.add_2_rocrate(dico) def get_processes_defined(self): - return self.nextflow_file.get_processes_defined() + processes = self.nextflow_file.get_processes_defined(dict={}).keys() + return list(processes) def get_processes_called(self): return self.nextflow_file.get_processes_called() -- GitLab