Merge branch 'dev' into 1879_sync_template_yaml

nf-core · Oct 12, 2022 · 2898626 · 2898626
2 parents 3d94124 + 6d7625a
commit 2898626
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/nf_core/modules/modules_repo.py b/nf_core/modules/modules_repo.py
@@ -381,10 +381,6 @@ def install_subworkflow(self, subworkflow_name, install_dir, commit):
 
         # Copy the files from the repo to the install folder
         shutil.copytree(self.get_subworkflow_dir(subworkflow_name), Path(install_dir, subworkflow_name))
-        if Path(install_dir, subworkflow_name, "nextflow.config").is_file():
-            log.info(
-                f"Subworkflow config include statement: includeConfig '{Path(install_dir, subworkflow_name, 'nextflow.config')}'"
-            )
 
         # Switch back to the tip of the branch
         self.checkout_branch()

diff --git a/nf_core/subworkflows/install.py b/nf_core/subworkflows/install.py
@@ -171,6 +171,9 @@ def install(self, subworkflow, silent=False):
             log.info(
                 f"Include statement: include {{ {subworkflow_name} }} from '.{os.path.join(install_folder, subworkflow)}/main'"
             )
+            subworkflow_config = os.path.join(install_folder, subworkflow, "nextflow.config")
+            if os.path.isfile(subworkflow_config):
+                log.info(f"Subworkflow config include statement: includeConfig '{subworkflow_config}'")
 
         # Update module.json with newly installed subworkflow
         modules_json.load()