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

Fixes for 2.3.1 patch release #282

Merged
merged 3 commits into from
Feb 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ jobs:
- "--min_barcode_reads 10000"
- "--min_guppyplex_reads 10000"
- "--artic_minion_caller medaka --sequencing_summary false --fast5_dir false"
- "--artic_minion_caller medaka --sequencing_summary false --fast5_dir false --artic_minion_medaka_model r941_min_high_g360"
steps:
- name: Check out pipeline code
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
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).

## [Unpublished Version / DEV]
## [[2.3.2](https://github.com/nf-core/viralrecon/releases/tag/2.3.2)] - 2022-02-21

### Enhancements & fixes

### Parameters
* [[#281](https://github.com/nf-core/viralrecon/issues/281)] - Nanopore medaka processing fails with error if model name, not model file, provided

## [[2.3.1](https://github.com/nf-core/viralrecon/releases/tag/2.3.1)] - 2022-02-15

Expand Down
4 changes: 2 additions & 2 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"git_sha": "e745e167c1020928ef20ea1397b6b4d230681b4d"
},
"artic/minion": {
"git_sha": "e745e167c1020928ef20ea1397b6b4d230681b4d"
"git_sha": "cab399507bea60d90de6d7b296163210c371b693"
},
"bandage/image": {
"git_sha": "e745e167c1020928ef20ea1397b6b4d230681b4d"
Expand Down Expand Up @@ -79,7 +79,7 @@
"git_sha": "e745e167c1020928ef20ea1397b6b4d230681b4d"
},
"ivar/variants": {
"git_sha": "e745e167c1020928ef20ea1397b6b4d230681b4d"
"git_sha": "cab399507bea60d90de6d7b296163210c371b693"
},
"kraken2/kraken2": {
"git_sha": "e745e167c1020928ef20ea1397b6b4d230681b4d"
Expand Down
5 changes: 3 additions & 2 deletions modules/nf-core/modules/artic/minion/main.nf

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

11 changes: 8 additions & 3 deletions modules/nf-core/modules/artic/minion/meta.yml

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

1 change: 1 addition & 0 deletions modules/nf-core/modules/ivar/variants/main.nf

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

4 changes: 4 additions & 0 deletions modules/nf-core/modules/ivar/variants/meta.yml

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 @@ -234,7 +234,7 @@ manifest {
description = 'Assembly and intrahost/low-frequency variant calling for viral samples'
mainScript = 'main.nf'
nextflowVersion = '!>=21.10.3'
version = '2.4dev'
version = '2.3.2'
}

// Load modules.config for DSL2 module specific options
Expand Down
2 changes: 2 additions & 0 deletions subworkflows/local/variants_ivar.nf
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ workflow VARIANTS_IVAR {
take:
bam // channel: [ val(meta), [ bam ] ]
fasta // channel: /path/to/genome.fasta
fai // channel: /path/to/genome.fai
sizes // channel: /path/to/genome.sizes
gff // channel: /path/to/genome.gff
bed // channel: /path/to/primers.bed
Expand All @@ -28,6 +29,7 @@ workflow VARIANTS_IVAR {
IVAR_VARIANTS (
bam,
fasta,
fai,
gff,
params.save_mpileup
)
Expand Down
1 change: 1 addition & 0 deletions workflows/illumina.nf
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ workflow ILLUMINA {
VARIANTS_IVAR (
ch_bam,
PREPARE_GENOME.out.fasta,
PREPARE_GENOME.out.fai,
PREPARE_GENOME.out.chrom_sizes,
PREPARE_GENOME.out.gff,
(params.protocol == 'amplicon' && params.primer_bed) ? PREPARE_GENOME.out.primer_bed : [],
Expand Down
1 change: 1 addition & 0 deletions workflows/nanopore.nf
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ workflow NANOPORE {
PREPARE_GENOME.out.fasta,
PREPARE_GENOME.out.primer_bed,
ch_medaka_model.collect().ifEmpty([]),
params.artic_minion_medaka_model,
params.artic_scheme,
params.primer_set_version
)
Expand Down