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

Fix resource issues and bump versions #208

Merged
merged 6 commits into from
Nov 27, 2023
Merged

Fix resource issues and bump versions #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b7441b
bump versions
pinin4fjords Nov 27, 2023
c0c4de6
Fix resource issues
pinin4fjords Nov 27, 2023
c993eac
update changelog
pinin4fjords Nov 27, 2023
2b2caae
[automated] Fix linting with Prettier
nf-core-bot Nov 27, 2023
3f56135
Update changelog
pinin4fjords Nov 27, 2023
804d6e5
Merge branch 'de_resources' of github.com:nf-core/differentialabundan…
pinin4fjords Nov 27, 2023
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
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop

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
View file
Open in desktop
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