Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update template version of the dumpsoftwareversions module #1281

Merged
merged 2 commits into from
Oct 7, 2021
Merged

Update template version of the dumpsoftwareversions module #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b402201
Update template to fix dumpsoftwareversions
JoseEspinosa Oct 6, 2021
56162a5
Update changelog
JoseEspinosa Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion nf_core/pipeline-template/modules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"repos": {
"nf-core/modules": {
"custom/dumpsoftwareversions": {
"git_sha": "7b3315591a149609e27914965f858c9a7e071564"
"git_sha": "84f2302920078b0cf7716b2a2e5fcc0be5c4531d"
},
"fastqc": {
"git_sha": "7b3315591a149609e27914965f858c9a7e071564"
Expand Down
2 changes: 1 addition & 1 deletion nf_core/pipeline-template/modules/nf-core/modules/custom/dumpsoftwareversions/main.nf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions nf_core/pipeline-template/modules/nf-core/modules/custom/dumpsoftwareversions/meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion nf_core/pipeline-template/workflows/pipeline.nf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
)

//
Expand Down