diff --git a/CHANGELOG.md b/CHANGELOG.md index 048f20c8d4..b8f0f96823 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Template +- Fix links in `multiqc_config.yml` ([#2372](https://github.com/nf-core/tools/pull/2372)) - Remove default false from nextflow_schema.json ([#2376](https://github.com/nf-core/tools/pull/2376)) - Add module MULTIQC to modules.config ([#2377](https://github.com/nf-core/tools/pull/2377)) diff --git a/nf_core/bump_version.py b/nf_core/bump_version.py index b462ee1377..5f4616edfb 100644 --- a/nf_core/bump_version.py +++ b/nf_core/bump_version.py @@ -45,14 +45,19 @@ def bump_pipeline_version(pipeline_obj, new_version): ], ) # multiqc_config.yaml + multiqc_new_version = "dev" if "dev" in new_version else new_version update_file_version( Path("assets", "multiqc_config.yml"), pipeline_obj, [ + ( + "/dev", + f"/{multiqc_new_version}", + ), ( rf"{re.escape(current_version)}", - f"{new_version}", - ) + f"{multiqc_new_version}", + ), ], ) diff --git a/nf_core/lint/multiqc_config.py b/nf_core/lint/multiqc_config.py index 9eff60091f..4877b41194 100644 --- a/nf_core/lint/multiqc_config.py +++ b/nf_core/lint/multiqc_config.py @@ -72,12 +72,13 @@ def multiqc_config(self): # Check that the minimum plugins exist and are coming first in the summary try: version = self.nf_config.get("manifest.version", "").strip(" '\"") + version = "dev" if "dev" in version else version if "report_comment" not in mqc_yml: raise AssertionError() if mqc_yml["report_comment"].strip() != ( - f'This report has been generated by the nf-core/{self.pipeline_name} analysis pipeline. For information about how to ' - f'interpret these results, please see the documentation.' ): raise AssertionError() diff --git a/nf_core/pipeline-template/assets/multiqc_config.yml b/nf_core/pipeline-template/assets/multiqc_config.yml index 570ed3d8e5..9423ee53f7 100644 --- a/nf_core/pipeline-template/assets/multiqc_config.yml +++ b/nf_core/pipeline-template/assets/multiqc_config.yml @@ -1,7 +1,13 @@ report_comment: > - This report has been generated by the {{ name }} + {% if 'dev' in version -%} + This report has been generated by the {{ name }} analysis pipeline.{% if branded %} For information about how to interpret these results, please see the - documentation.{% endif %} + documentation.{% endif %} + {%- else %} + This report has been generated by the {{ name }} + analysis pipeline.{% if branded %} For information about how to interpret these results, please see the + documentation.{% endif %} + {% endif %} report_section_order: "{{ name_noslash }}-methods-description": order: -1000