Skip to content

Commit

Permalink
Merge pull request #260 from d4straub/dev
Browse files Browse the repository at this point in the history
Prepare for release 2.1.1
  • Loading branch information
d4straub authored Nov 23, 2021
2 parents 2caec7c + 70029fa commit 5a74dba
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v2.2.0dev - [date]
## v2.1.1 - 2021/11/23

### `Added`

Expand All @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- [#249](https://github.com/nf-core/mag/pull/249) - Update workflow overview figure.
- [#258](https://github.com/nf-core/mag/pull/258) - Updated MultiQC 1.9 to 1.11.
- [#260](https://github.com/nf-core/mag/pull/260) - Updated SPAdes 3.13.1 -> 3.15.3, MEGAHIT 1.2.7 -> 1.2.7

### `Fixed`

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ Long read processing was inspired by [caspargross/HybridAssembly](https://github
We thank the following people for their extensive assistance in the development of this pipeline:

* [Alexander Peltzer](https://github.com/apeltzer)
* [Antonia Schuster](https://github.com/antoniaschuster)
* [Phil Ewels](https://github.com/ewels)
* [Gisela Gabernet](https://github.com/ggabernet)
* [Harshil Patel](https://github.com/drpatelh)
Expand Down
6 changes: 3 additions & 3 deletions modules/local/megahit.nf
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ process MEGAHIT {
mode: params.publish_dir_mode,
saveAs: { filename -> saveFiles(filename:filename, options:params.options, publish_dir:getSoftwareName(task.process), meta:meta, publish_by_meta:['id']) }

conda (params.enable_conda ? "bioconda::megahit=1.2.7" : null)
conda (params.enable_conda ? "bioconda::megahit=1.2.9" : null)
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/megahit:1.2.7--h8b12597_0"
container "https://depot.galaxyproject.org/singularity/megahit:1.2.9--h2e03b76_1"
} else {
container "quay.io/biocontainers/megahit:1.2.7--h8b12597_0"
container "quay.io/biocontainers/megahit:1.2.9--h2e03b76_1"
}

input:
Expand Down
6 changes: 3 additions & 3 deletions modules/local/spades.nf
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ process SPADES {
mode: params.publish_dir_mode,
saveAs: { filename -> saveFiles(filename:filename, options:params.options, publish_dir:getSoftwareName(task.process), meta:meta, publish_by_meta:['id']) }

conda (params.enable_conda ? "bioconda::spades=3.13.1" : null)
conda (params.enable_conda ? "bioconda::spades=3.15.3" : null)
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/spades:3.13.1--h2d02072_2"
container "https://depot.galaxyproject.org/singularity/spades:3.15.3--h95f258a_0"
} else {
container "quay.io/biocontainers/spades:3.13.1--h2d02072_2"
container "quay.io/biocontainers/spades:3.15.3--h95f258a_0"
}

input:
Expand Down
6 changes: 3 additions & 3 deletions modules/local/spadeshybrid.nf
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ process SPADESHYBRID {
mode: params.publish_dir_mode,
saveAs: { filename -> saveFiles(filename:filename, options:params.options, publish_dir:getSoftwareName(task.process), meta:meta, publish_by_meta:['id']) }

conda (params.enable_conda ? "bioconda::spades=3.13.1" : null)
conda (params.enable_conda ? "bioconda::spades=3.15.3" : null)
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/spades:3.13.1--h2d02072_2"
container "https://depot.galaxyproject.org/singularity/spades:3.15.3--h95f258a_0"
} else {
container "quay.io/biocontainers/spades:3.13.1--h2d02072_2"
container "quay.io/biocontainers/spades:3.15.3--h95f258a_0"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ manifest {
description = 'Assembly, binning and annotation of metagenomes'
mainScript = 'main.nf'
nextflowVersion = '!>=21.04.0'
version = '2.2.0dev'
version = '2.1.1'
}

// Function to ensure that resource requirements don't go beyond
Expand Down

0 comments on commit 5a74dba

Please sign in to comment.