From 8301585fc39af76da44334e5f4ee85b9885f1201 Mon Sep 17 00:00:00 2001 From: Fabian Egli Date: Wed, 13 Apr 2022 07:26:43 +0200 Subject: [PATCH 1/2] only allow default dag format in lint --- nf_core/lint/nextflow_config.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nf_core/lint/nextflow_config.py b/nf_core/lint/nextflow_config.py index b0162191cb..af9dece05a 100644 --- a/nf_core/lint/nextflow_config.py +++ b/nf_core/lint/nextflow_config.py @@ -229,14 +229,11 @@ def nextflow_config(self): # Check that the DAG filename ends in ``.svg`` if "dag.file" in self.nf_config: - _, dag_file_suffix = os.path.splitext(self.nf_config["dag.file"].strip("'\"")) - allowed_dag_file_suffixes = [".dot", ".html", ".pdf", ".png", ".svg", ".gexf"] - if dag_file_suffix in allowed_dag_file_suffixes: - passed.append(f"Config ``dag.file`` ended with ``.{dag_file_suffix}``") + default_dag_format = ".html" + if self.nf_config["dag.file"].strip("'\"").endswith(default_dag_format): + passed.append(f"Config ``dag.file`` ended with ``{default_dag_format}``") else: - failed.append( - f"Config ``dag.file`` ended with ``.{dag_file_suffix}`` but needs to be one of {allowed_dag_file_suffixes!r}" - ) + failed.append(f"Config ``dag.file`` did not end with ``{default_dag_format}``") # Check that the minimum nextflowVersion is set properly if "manifest.nextflowVersion" in self.nf_config: From 9b3e7c6996b0535b8a59a6c88363f0e9e2302ce9 Mon Sep 17 00:00:00 2001 From: Fabian Egli Date: Wed, 13 Apr 2022 07:29:00 +0200 Subject: [PATCH 2/2] Remove obsolete changelog message --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65915dbefe..7be8cec92e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ ## v2.4dev -This patch release to removes the Graphviz dependency from default pipeline template by setting the defaul DAG format to HTML. To keep the previous behaviour, the "dag.file" file extension needs to be changed to ".svg" in the nextflow.config. - ### Template - Set the default DAG graphic output to HTML to have a default that does not depend on Graphviz being installed on the host system ([#1512](https://github.com/nf-core/tools/pull/1512)).