-
Notifications
You must be signed in to change notification settings - Fork 420
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
Sarek bcftools normalization #1682
Open
Patricie34
wants to merge
66
commits into
nf-core:dev
Choose a base branch
from
Patricie34:sarek_bcftools_norm
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
66 commits
Select commit
Hold shift + click to select a range
4772da1
First modification to contribute to the bcftools/norm module in Sarek
JC-Delmas 451aaec
Changes in the GERMLINE_VCFS_NORM process
JC-Delmas d97726b
Add fasta argument to POST_VARIANTCALLING process.
JC-Delmas e034ff0
add fasta input as argument
JC-Delmas 8469832
remove vcfs in the GERMLINE_VCFS_NORM process, replaced by germline_v…
JC-Delmas e885888
First modification to contribute to the bcftools/norm module in Sarek
JC-Delmas 9e94a05
Changes in the GERMLINE_VCFS_NORM process
JC-Delmas 2bdba7e
Add fasta argument to POST_VARIANTCALLING process.
JC-Delmas 1214f10
add fasta input as argument
JC-Delmas b7ba4f2
remove vcfs in the GERMLINE_VCFS_NORM process, replaced by germline_v…
JC-Delmas 34bf47b
Update workflows/sarek/main.nf
JC-Delmas 6dff9af
Resolved merge conflict by keeping changes from branch 34bf47baa9d61f…
JC-Delmas d289261
Refactor normalization and concatenation of VCF files
JC-Delmas c78af62
Modify and adjust two scripts to add normalization and integrate FAST…
JC-Delmas d646ec3
Added normalization for all vcfs
Patricie34 8fb64b2
Fixed linting issues and updated schema parameters
Patricie34 92094af
Update conf/modules/post_variant_calling.config
Patricie34 fbbfe1b
edit of normalization steps
Patricie34 24791dc
Fixed linting issues
Patricie34 50f1b4b
Merge remote-tracking branch 'upstream/dev' into sarek_bcftools_norm
Patricie34 fb4bb1e
Sync with dev_branch
Patricie34 a80cf11
Updated CHANGELOG.md
Patricie34 b0f6c12
Update conf/modules/post_variant_calling.config
Patricie34 3bcc27b
Update nextflow.config
Patricie34 f3c6ac6
Changed module.config
Patricie34 f9c815d
Changelog.md updated
Patricie34 f60d60d
Fixed params.normalize
Patricie34 c0a6ffc
Update CHANGELOG.md
Patricie34 188cf86
pytesttags.yml changed
Patricie34 1fe12e3
edited test_normalize_vcfs.yml
Patricie34 f9e5204
Separated vcf_normalization
Patricie34 7c96c98
Merge branch 'dev' into sarek_bcftools_norm
maxulysse b5909f2
module.config edited
Patricie34 ea7d25a
extra file removed
Patricie34 391f1ea
post_variantcalling edited
Patricie34 0bdb5d4
added annotation for vcfs_normalized
Patricie34 969014f
post_variant_calling.config changed
Patricie34 3d58991
Merge branch 'dev' into sarek_bcftools_norm
maxulysse 1864091
Update CHANGELOG.md
Patricie34 ca4de22
Update tests/test_normalize_vcfs.yml
Patricie34 08bda4b
Update tests/test_concat_germline_vcfs.yml
Patricie34 8044e66
Merge remote-tracking branch 'upstream/dev' into sarek_bcftools_norm
Patricie34 c5146ec
CHANGELOG.md
Patricie34 138a06b
Merge branch 'sarek_bcftools_norm' of github.com:Patricie34/sarek int…
Patricie34 fed7bdc
test_normalize_vcfs.yml changed
Patricie34 0dbcabd
Update conf/modules/post_variant_calling.config
maxulysse 3f99fb2
Update subworkflows/local/vcf_normalization/main.nf
maxulysse 2ed8ad1
Update subworkflows/local/vcf_normalization/main.nf
maxulysse 817847c
versions corrected
Patricie34 af736b4
Apply suggestions from code review
maxulysse e877ed4
vcf_concatenate_germline workflow edit
Patricie34 bb48905
major changes in concatenate_vcfs
Patricie34 4980695
paths in test.yml changed
Patricie34 a31e7db
linting changed
Patricie34 74fd353
test_concatenate.yml edited
Patricie34 ee2bcb9
test_concatenate.yml edited
Patricie34 4b69e35
test_concatenate.yml adn normalize_yml edited
Patricie34 b0a44d6
update docs, changelog and readme
Patricie34 6c39a63
output.md linting
Patricie34 7ae3b44
subway_map updated
Patricie34 6f1f8ec
Resolved merge conflicts with upstream/dev
Patricie34 01b974b
Subway_map updated
Patricie34 fe5027a
Merge remote-tracking branch 'upstream/dev' into sarek_bcftools_norm …
Patricie34 f58bc10
CHANGELOG.md updated
Patricie34 5784bb7
CHANGELOG edited
Patricie34 d31ad52
README.md edited
Patricie34 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -16,7 +16,7 @@ | |||||||||
|
||||||||||
process { | ||||||||||
|
||||||||||
withName: 'GERMLINE_VCFS_CONCAT'{ | ||||||||||
withName: 'GERMLINE_VCFS_CONCAT' { | ||||||||||
ext.args = { "-a" } | ||||||||||
ext.when = { params.concatenate_vcfs } | ||||||||||
publishDir = [ | ||||||||||
|
@@ -25,26 +25,61 @@ process { | |||||||||
] | ||||||||||
} | ||||||||||
|
||||||||||
withName: 'GERMLINE_VCFS_CONCAT_SORT'{ | ||||||||||
withName: 'GERMLINE_VCFS_CONCAT_SORT' { | ||||||||||
ext.prefix = { "${meta.id}.germline" } | ||||||||||
ext.when = { params.concatenate_vcfs } | ||||||||||
publishDir = [ | ||||||||||
mode: params.publish_dir_mode, | ||||||||||
path: { "${params.outdir}/variant_calling/concat/${meta.id}/" } | ||||||||||
path: { "${params.outdir}/variant_calling/concat/${meta.id}/" }, | ||||||||||
pattern: "*vcf.gz" | ||||||||||
] | ||||||||||
} | ||||||||||
|
||||||||||
withName: 'VCFS_NORM_SORT' { | ||||||||||
ext.prefix = { "${meta.id}.${meta.variantcaller}.norm" } | ||||||||||
ext.when = { params.normalize_vcfs } | ||||||||||
publishDir = [ | ||||||||||
mode: params.publish_dir_mode, | ||||||||||
path: { "${params.outdir}/variant_calling/normalized/${meta.id}/" }, | ||||||||||
pattern: "*vcf.gz" | ||||||||||
] | ||||||||||
} | ||||||||||
|
||||||||||
withName: 'VCFS_NORM' { | ||||||||||
ext.args = { [ | ||||||||||
'--multiallelics -both', //split multiallelic sites into biallelic records and both SNPs and indels should be merged separately into two records | ||||||||||
'--rm-dup all' //output only the first instance of a record which is present multiple times | ||||||||||
].join(' ') } | ||||||||||
ext.when = { params.normalize_vcfs } | ||||||||||
publishDir = [ | ||||||||||
mode: params.publish_dir_mode, | ||||||||||
path: { "${params.outdir}/variant_calling/normalized/${meta.id}/" } | ||||||||||
] | ||||||||||
} | ||||||||||
|
||||||||||
withName: 'TABIX_EXT_VCF' { | ||||||||||
ext.prefix = { "${input.baseName}" } | ||||||||||
ext.when = { params.concatenate_vcfs } | ||||||||||
ext.prefix = { "${input.baseName}" } | ||||||||||
ext.when = { params.concatenate_vcfs || params.normalize_vcfs } | ||||||||||
Comment on lines
+61
to
+62
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||
} | ||||||||||
|
||||||||||
withName: 'TABIX_GERMLINE_VCFS_CONCAT_SORT'{ | ||||||||||
ext.prefix = { "${meta.id}.germline" } | ||||||||||
ext.when = { params.concatenate_vcfs } | ||||||||||
publishDir = [ | ||||||||||
mode: params.publish_dir_mode, | ||||||||||
path: { "${params.outdir}/variant_calling/concat/${meta.id}/" } | ||||||||||
path: { "${params.outdir}/variant_calling/concat/${meta.id}/" }, | ||||||||||
pattern: "*.tbi" | ||||||||||
] | ||||||||||
} | ||||||||||
|
||||||||||
withName: 'TABIX_VCFS_NORM_SORT'{ | ||||||||||
ext.prefix = { "${meta.id}.${meta.variantcaller}.norm" } | ||||||||||
ext.when = { params.normalize_vcfs } | ||||||||||
publishDir = [ | ||||||||||
mode: params.publish_dir_mode, | ||||||||||
path: { "${params.outdir}/variant_calling/normalized/${meta.id}/" }, | ||||||||||
pattern: "*.tbi" | ||||||||||
] | ||||||||||
} | ||||||||||
} | ||||||||||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
alphabetical order 😄