Skip to content

Commit

Permalink
Merge pull request #208 from nf-core/de_resources
Browse files Browse the repository at this point in the history
Fix resource issues and bump versions
  • Loading branch information
pinin4fjords authored Nov 27, 2023
2 parents 47ef421 + 804d6e5 commit f09a2fc
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 8 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
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).

## v1.5.0dev

### `Added`

### `Fixed`

- [[#208](https://github.com/nf-core/differentialabundance/pull/208)] - Fix resource issues and bump versions ([@pinin4fjords](https://github.com/pinin4fjords), review by [@sguizard](https://github.com/sguizard))

### `Changed`

## v1.4.0 - 2023-11-27

### `Added`
Expand Down
4 changes: 2 additions & 2 deletions assets/multiqc_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
report_comment: >
This report has been generated by the <a href="https://github.com/nf-core/differentialabundance/releases/tag/1.4.0" target="_blank">nf-core/differentialabundance</a>
This report has been generated by the <a href="https://github.com/nf-core/differentialabundance/releases/tag/dev" target="_blank">nf-core/differentialabundance</a>
analysis pipeline. For information about how to interpret these results, please see the
<a href="https://nf-co.re/differentialabundance/1.4.0/docs/output" target="_blank">documentation</a>.
<a href="https://nf-co.re/differentialabundance/dev/docs/output" target="_blank">documentation</a>.
report_section_order:
"nf-core-differentialabundance-methods-description":
order: -1000
Expand Down
2 changes: 1 addition & 1 deletion conf/base.config
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ process {
}
withLabel:process_medium {
cpus = { check_max( 6 * task.attempt, 'cpus' ) }
memory = { check_max( 2.GB * task.attempt, 'memory' ) }
memory = { check_max( 36.GB * task.attempt, 'memory' ) }
time = { check_max( 8.h * task.attempt, 'time' ) }
}
withLabel:process_high {
Expand Down
4 changes: 2 additions & 2 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"deseq2/differential": {
"branch": "master",
"git_sha": "c992bd93b22a97feda5f04755511366c45423626",
"git_sha": "9326d73af3fbe2ee90d9ce0a737461a727c5118e",
"installed_by": ["modules"]
},
"geoquery/getgeo": {
Expand All @@ -57,7 +57,7 @@
},
"limma/differential": {
"branch": "master",
"git_sha": "25047aa940979f64b31d19b94c483a9254263892",
"git_sha": "9326d73af3fbe2ee90d9ce0a737461a727c5118e",
"installed_by": ["modules"]
},
"proteus/readproteingroups": {
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/deseq2/differential/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/limma/differential/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ manifest {
description = 'Differential abundance analysis'
mainScript = 'main.nf'
nextflowVersion = '!>=23.10.0'
version = '1.4.0'
version = '1.5.0dev'
doi = '10.5281/zenodo.7568000'
}

Expand Down

0 comments on commit f09a2fc

Please sign in to comment.