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

Final pre-release fixes #366

Merged
merged 4 commits into from
Mar 21, 2023
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
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,20 @@
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).

## [[2.6](https://github.com/nf-core/viralrecon/releases/tag/2.6)] - 2023-03-17
## [[2.6.0](https://github.com/nf-core/viralrecon/releases/tag/2.6.0)] - 2023-03-23

### Credits

Special thanks to the following for their code contributions to the release:

- [Friederike Hanssen](https://github.com/FriederikeHanssen)
- [Hugo Tavares](https://github.com/tavareshugo)
- [Matthew Wells](https://github.com/mattheww95)
- [Maxime Garcia](https://github.com/maxulysse)
- [Phil Ewels](https://github.com/ewels)
- [Sara Monzón](https://github.com/saramonzon)

Thank you to everyone else that has contributed by reporting bugs, enhancements or in any other way, shape or form.

### Enhancements & fixes

Expand Down
14 changes: 7 additions & 7 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"bcftools/norm": {
"branch": "master",
"git_sha": "c8e35eb2055c099720a75538d1b8adb3fb5a464c",
"git_sha": "bcad95fb35e567ad25840d3297c3e17eff211a3a",
"installed_by": ["modules"]
},
"bcftools/query": {
Expand Down Expand Up @@ -142,7 +142,7 @@
},
"kraken2/kraken2": {
"branch": "master",
"git_sha": "c8e35eb2055c099720a75538d1b8adb3fb5a464c",
"git_sha": "7c695e0147df1157413e06246d9b0094617d3e6b",
"installed_by": ["modules"]
},
"minia": {
Expand Down Expand Up @@ -177,13 +177,13 @@
},
"picard/collectmultiplemetrics": {
"branch": "master",
"git_sha": "2f88b26e9804b99e98f7cd08e74c3f88288a3358",
"git_sha": "75027bf77472b1f4fd2cdd7e46f83119dfb0f2c6",
"installed_by": ["modules"]
},
"picard/markduplicates": {
"branch": "master",
"git_sha": "2f88b26e9804b99e98f7cd08e74c3f88288a3358",
"installed_by": ["bam_markduplicates_picard", "modules"]
"git_sha": "75027bf77472b1f4fd2cdd7e46f83119dfb0f2c6",
"installed_by": ["modules", "bam_markduplicates_picard"]
},
"plasmidid": {
"branch": "master",
Expand Down Expand Up @@ -266,7 +266,7 @@
"nf-core": {
"bam_markduplicates_picard": {
"branch": "master",
"git_sha": "6daac2bc63f4847e0c7cc661f4f5b043ac13faaf",
"git_sha": "6f1697c121719dedde9e0537b6ed6a9cb8c13583",
"installed_by": ["subworkflows"]
},
"bam_sort_stats_samtools": {
Expand All @@ -276,7 +276,7 @@
},
"bam_stats_samtools": {
"branch": "master",
"git_sha": "92eb5091ae5368a60cda58b3a0ced8b36d715b0f",
"git_sha": "b4b7f89e7fd6d2293f0c176213f710e0bcdaf19e",
"installed_by": ["bam_sort_stats_samtools", "bam_markduplicates_picard"]
},
"fastq_align_bowtie2": {
Expand Down
22 changes: 17 additions & 5 deletions modules/nf-core/bcftools/norm/main.nf

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

4 changes: 2 additions & 2 deletions modules/nf-core/bcftools/norm/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 modules/nf-core/kraken2/kraken2/main.nf

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

6 changes: 3 additions & 3 deletions modules/nf-core/picard/collectmultiplemetrics/main.nf

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

6 changes: 3 additions & 3 deletions modules/nf-core/picard/markduplicates/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 @@ -255,7 +255,7 @@ manifest {
description = """Assembly and intrahost/low-frequency variant calling for viral samples"""
mainScript = 'main.nf'
nextflowVersion = '!>=22.10.1'
version = '2.6'
version = '2.6.0'
doi = 'https://doi.org/10.5281/zenodo.3901628'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//

include { IVAR_TRIM } from '../../modules/nf-core/ivar/trim/main'
include { BAM_SORT_STATS_SAMTOOLS } from './bam_sort_stats_samtools/main'
include { BAM_SORT_STATS_SAMTOOLS } from '../nf-core/bam_sort_stats_samtools/main'

workflow BAM_TRIM_PRIMERS_IVAR {
take:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

include { SAMTOOLS_VIEW } from '../../modules/nf-core/samtools/view/main'
include { SAMTOOLS_INDEX } from '../../modules/nf-core/samtools/index/main'
include { BAM_STATS_SAMTOOLS } from './bam_stats_samtools'
include { BAM_STATS_SAMTOOLS } from '../nf-core/bam_stats_samtools/main'

workflow FILTER_BAM_SAMTOOLS {
take:
Expand Down
2 changes: 1 addition & 1 deletion subworkflows/local/snpeff_snpsift.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
include { SNPEFF_ANN } from '../../modules/local/snpeff_ann'
include { SNPSIFT_EXTRACTFIELDS } from '../../modules/local/snpsift_extractfields'

include { VCF_BGZIP_TABIX_STATS } from '../nf-core/vcf_bgzip_tabix_stats'
include { VCF_BGZIP_TABIX_STATS } from './vcf_bgzip_tabix_stats'

workflow SNPEFF_SNPSIFT {
take:
Expand Down
2 changes: 1 addition & 1 deletion subworkflows/local/variants_bcftools.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

include { BCFTOOLS_MPILEUP } from '../../modules/nf-core/bcftools/mpileup/main'
include { BCFTOOLS_NORM } from '../../modules/nf-core/bcftools/norm/main'
include { VCF_TABIX_STATS } from '../nf-core/vcf_tabix_stats'
include { VCF_TABIX_STATS } from './vcf_tabix_stats'
include { VARIANTS_QC } from './variants_qc'

workflow VARIANTS_BCFTOOLS {
Expand Down
2 changes: 1 addition & 1 deletion subworkflows/local/variants_ivar.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
include { IVAR_VARIANTS } from '../../modules/nf-core/ivar/variants/main'
include { IVAR_VARIANTS_TO_VCF } from '../../modules/local/ivar_variants_to_vcf'
include { BCFTOOLS_SORT } from '../../modules/nf-core/bcftools/sort/main'
include { VCF_TABIX_STATS } from '../nf-core/vcf_tabix_stats'
include { VCF_TABIX_STATS } from './vcf_tabix_stats'
include { VARIANTS_QC } from './variants_qc'

workflow VARIANTS_IVAR {
Expand Down
25 changes: 12 additions & 13 deletions subworkflows/nf-core/bam_markduplicates_picard/main.nf

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

65 changes: 32 additions & 33 deletions subworkflows/nf-core/bam_markduplicates_picard/meta.yml

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

Loading