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.

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

CHORES: update all modules #1304

Merged
merged 21 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#1278](https://github.com/nf-core/sarek/pull/1278) - Hide sentieon parameters similar to other variant callers
- [#1280](https://github.com/nf-core/sarek/pull/1280) - Replacing link to `SentieonDNAscopeModel1.1.model` in Sentieon's S3 with link to same file in igenomes' S3
- [#1303](https://github.com/nf-core/sarek/pull/1303) - Ressurect vep_version params and changed its scope to pipeline to enable usage for vep loftee plugin
- [#1304](https://github.com/nf-core/sarek/pull/1304) - Update modules

### Fixed

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

| Dependency | Old version | New version |
| ---------- | ----------- | ----------- |
| fastqc | 0.11.9 | 0.12.1 |
| multiqc | 1.15 | 1.17 |

### Modules / Subworkflows

| script | Old name | New name |
| ----------------------------- | ----------------------------- | ----------------------------- |
| `gatk4spark/applybqsr` | `GATK4_APPLYBQSRSPARK` | 'GATK4SPARK_APPLYBQSR' |
| `gatk4spark/baserecalibrator` | `GATK4_BASERECALIBRATORSPARK` | 'GATK4SPARK_BASERECALIBRATOR' |
| `gatk4spark/markduplicates` | `GATK4_MARKDUPLICATESSPARK` | 'GATK4SPARK_MARKDUPLICATES' |

## [3.3.2](https://github.com/nf-core/sarek/releases/tag/3.3.2) - Ráhpajávvre

Expand Down
4 changes: 2 additions & 2 deletions conf/base.config
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ process {
label = "process_high"
memory = { check_max( 36.GB * task.attempt, 'memory' ) }
}
withName: 'GATK4_MARKDUPLICATES|GATK4_MARKDUPLICATESSPARK' {
withName: 'GATK4_MARKDUPLICATES|GATK4SPARK_MARKDUPLICATES' {
maxulysse marked this conversation as resolved.
Show resolved Hide resolved
cpus = { check_max( 6 * task.attempt, 'cpus' ) }
memory = { check_max( 30.GB * task.attempt, 'memory' ) }
}
withName:'GATK4_APPLYBQSR|GATK4_APPLYBQSR_SPARK|GATK4_BASERECALIBRATOR|GATK4_BASERECALIBRATOR_SPARK|GATK4_GATHERBQSRREPORTS'{
withName:'GATK4_APPLYBQSR|GATK4SPARK_APPLYBQSR|GATK4_BASERECALIBRATOR|GATK4SPARK_BASERECALIBRATOR|GATK4_GATHERBQSRREPORTS'{
cpus = { check_max( 2 * task.attempt, 'cpus' ) }
memory = { check_max( 4.GB * task.attempt, 'memory' ) }
}
Expand Down
2 changes: 1 addition & 1 deletion conf/modules/annotate.config
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ process {
if (params.tools && params.tools.split(',').contains('bcfann')) {
withName: 'NFCORE_SAREK:SAREK:VCF_ANNOTATE_ALL:VCF_ANNOTATE_BCFTOOLS:BCFTOOLS_ANNOTATE' {
ext.args = '--output-type z'
ext.prefix = { "${vcf.baseName.minus(".vcf")}_BCF.ann" }
ext.prefix = { input.baseName - ".vcf" + "_BCF.ann" }
publishDir = [
mode: params.publish_dir_mode,
path: { "${params.outdir}/annotation/${meta.variantcaller}/${meta.id}/" },
Expand Down
2 changes: 1 addition & 1 deletion conf/modules/prepare_recalibration.config
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

process {

withName: 'GATK4_BASERECALIBRATOR|GATK4_BASERECALIBRATOR_SPARK' {
withName: 'GATK4_BASERECALIBRATOR|GATK4SPARK_BASERECALIBRATOR' {
ext.prefix = { meta.num_intervals <= 1 ? "${meta.id}.recal" : "${meta.id}_${intervals.simpleName}.recal" }
publishDir = [
mode: params.publish_dir_mode,
Expand Down
2 changes: 1 addition & 1 deletion conf/modules/recalibrate.config
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

process {

withName: 'GATK4_APPLYBQSR|GATK4_APPLYBQSR_SPARK' {
withName: 'GATK4_APPLYBQSR|GATK4SPARK_APPLYBQSR' {
ext.prefix = { meta.num_intervals <= 1 ? "${meta.id}.recal" : "${meta.id}_${intervals.simpleName}.recal" }
publishDir = [
enabled: !params.save_output_as_bam,
Expand Down
218 changes: 109 additions & 109 deletions modules.json

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions modules/nf-core/ascat/environment.yml

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/ascat/main.nf

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

17 changes: 8 additions & 9 deletions modules/nf-core/ascat/meta.yml

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

85 changes: 12 additions & 73 deletions modules/nf-core/bcftools/annotate/bcftools-annotate.diff

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

6 changes: 6 additions & 0 deletions modules/nf-core/bcftools/annotate/environment.yml

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

30 changes: 15 additions & 15 deletions modules/nf-core/bcftools/annotate/main.nf

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

12 changes: 6 additions & 6 deletions modules/nf-core/bcftools/annotate/meta.yml

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

6 changes: 6 additions & 0 deletions modules/nf-core/bcftools/concat/environment.yml

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/bcftools/concat/main.nf

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

4 changes: 3 additions & 1 deletion modules/nf-core/bcftools/concat/meta.yml

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

6 changes: 6 additions & 0 deletions modules/nf-core/bcftools/mpileup/environment.yml

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

Loading
Loading