From ae2df4847bc933b236920474a15f9994ea75886e Mon Sep 17 00:00:00 2001 From: pavlemarinkovic Date: Thu, 11 Jul 2024 17:22:06 +0200 Subject: [PATCH] Use wrabbit 0.2.1 --- requirements.txt | 2 +- sbpack/noncwl/nextflow.py | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index cb076c3..69b3136 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ ruamel.yaml >= 0.16 sevenbridges-python >= 2.0 nf-core==2.1 -wrabbit==0.2.0 +wrabbit==0.2.1 cwlformat packaging \ No newline at end of file diff --git a/sbpack/noncwl/nextflow.py b/sbpack/noncwl/nextflow.py index f52950b..b581ae8 100755 --- a/sbpack/noncwl/nextflow.py +++ b/sbpack/noncwl/nextflow.py @@ -46,6 +46,9 @@ def nf_schema_build(self): Build nextflow schema using nf_core schema build feature and save to a file """ + if self.nf_schema_path: + return + nf_schema_path = os.path.join( self.workflow_path, NF_SCHEMA_DEFAULT_NAME, @@ -64,6 +67,8 @@ def nf_schema_build(self): ) self.nf_schema_path = nf_schema_path + self.init_config_files() + def main(): # CLI parameters @@ -248,13 +253,6 @@ def main(): schema = yaml.safe_load(s) nf_wrapper.sb_wrapper.load(schema) else: - # build schema - # Do this only if the nextflow_schema.json is missing - if not nf_wrapper.nf_schema_path: - nf_wrapper.nf_schema_build() - # update the nextflow_schema.json location - nf_wrapper.init_config_files() - # Create app nf_wrapper.generate_sb_app( execution_mode=execution_mode,