Merge pull request #1281 from JoseEspinosa/fix_software_ver

Update template version of the dumpsoftwareversions module
nf-core · Oct 7, 2021 · 7ca734b · 7ca734b
2 parents 770fa1b + 56162a5
commit 7ca734b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Template
 
 * Modify software version channel handling to support multiple software version emissions (e.g. from mulled containers), and multiple software versions.
+* Update `dumpsoftwareversion` module to correctly report versions with trailing zeros.
 
 ### General
 

diff --git a/nf_core/pipeline-template/modules.json b/nf_core/pipeline-template/modules.json
@@ -4,7 +4,7 @@
     "repos": {
         "nf-core/modules": {
             "custom/dumpsoftwareversions": {
-                "git_sha": "7b3315591a149609e27914965f858c9a7e071564"
+                "git_sha": "84f2302920078b0cf7716b2a2e5fcc0be5c4531d"
             },
             "fastqc": {
                 "git_sha": "7b3315591a149609e27914965f858c9a7e071564"

diff --git a/nf_core/pipeline-template/modules/nf-core/modules/custom/dumpsoftwareversions/main.nf b/nf_core/pipeline-template/modules/nf-core/modules/custom/dumpsoftwareversions/main.nf
@@ -79,7 +79,7 @@ process CUSTOM_DUMPSOFTWAREVERSIONS {
     }
 
     with open("$versions") as f:
-        workflow_versions = yaml.safe_load(f) | module_versions
+        workflow_versions = yaml.load(f, Loader=yaml.BaseLoader) | module_versions
 
     workflow_versions["Workflow"] = {
         "Nextflow": "$workflow.nextflow.version",

diff --git a/nf_core/pipeline-template/modules/nf-core/modules/custom/dumpsoftwareversions/meta.yml b/nf_core/pipeline-template/modules/nf-core/modules/custom/dumpsoftwareversions/meta.yml
@@ -24,9 +24,9 @@ output:
       type: file
       description: MultiQC custom content YML file containing software versions
       pattern: "software_versions_mqc.yml"
-  - version:
+  - versions:
       type: file
-      description: File containing software version
+      description: File containing software versions
       pattern: "versions.yml"
 
 authors:

diff --git a/nf_core/pipeline-template/workflows/pipeline.nf b/nf_core/pipeline-template/workflows/pipeline.nf
@@ -86,7 +86,7 @@ workflow {{ short_name|upper }} {
     ch_versions = ch_versions.mix(FASTQC.out.versions.first())
 
     CUSTOM_DUMPSOFTWAREVERSIONS (
-        ch_versions.collectFile()
+        ch_versions.unique().collectFile(name: 'collated_versions.yml')
     )
 
     //