Skip to content
Open
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#281](https://github.com/nf-core/phaseimpute/pull/281) - Fix `diffchr()` function.
- [#293](https://github.com/nf-core/phaseimpute/pull/293) - Fix nf-core and nextflow linting.
- [#297](https://github.com/nf-core/phaseimpute/pull/297) - Fix `VCF_NORMALIZE_BCFTOOLS:BCFTOOLS_VIEW` configuration for `remove_samples` to be properly parsed.
- [#298](https://github.com/nf-core/phaseimpute/pull/298) - Stabilise variants md5 hash when using `VCFLIB_VCFFIXUP` by using `.bcf.gz` files and `.csi` index.

### `Dependencies`

Expand Down
21 changes: 4 additions & 17 deletions conf/steps/panelprep.config
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ process {
}

withName: 'NFCORE_PHASEIMPUTE:PHASEIMPUTE:VCF_NORMALIZE_BCFTOOLS:BCFTOOLS_NORM' {
ext.args = ["-m +any", "--output-type z", "--write-index=tbi"].join(' ')
ext.args = ["-m +any", "--output-type b", "--write-index=csi"].join(' ')
ext.prefix = { "${meta.panel_id}_${meta.chr}_multiallelic" }
}

withName: 'NFCORE_PHASEIMPUTE:PHASEIMPUTE:VCF_NORMALIZE_BCFTOOLS:BCFTOOLS_VIEW' {
ext.args = {
def rm_samples = params.remove_samples ? "-s^${params.remove_samples} --force-samples" : ""
return "-v snps -m 2 -M 2 --output-type z --write-index=tbi ${rm_samples}"
def output_format = params.compute_freq ? "--output-type z" : "--output-type b"
return "-v snps -m 2 -M 2 --write-index=csi ${rm_samples} ${output_format}"
}
ext.prefix = { "${meta.panel_id}_${meta.chr}_normalized" }
publishDir = [
Expand All @@ -47,21 +48,7 @@ process {

withName: 'NFCORE_PHASEIMPUTE:PHASEIMPUTE:VCF_NORMALIZE_BCFTOOLS:VCFLIB_VCFFIXUP' {
ext.prefix = { "${meta.panel_id}_${meta.chr}_fixup" }
publishDir = [
path: { "${params.outdir}/prep_panel/panel" },
mode: params.publish_dir_mode,
saveAs: { filename ->
if ( !params.phase || params.publish_all ) {
filename
} else {
null
}
}
]
}

withName: 'NFCORE_PHASEIMPUTE:PHASEIMPUTE:VCF_NORMALIZE_BCFTOOLS:BCFTOOLS_INDEX' {
ext.args = "--tbi"
ext.args2 = "--output-type b --write-index=csi"
publishDir = [
path: { "${params.outdir}/prep_panel/panel" },
mode: params.publish_dir_mode,
Expand Down
6 changes: 3 additions & 3 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@
},
"shapeit5/ligate": {
"branch": "master",
"git_sha": "25ac0da595fac900aba3041d2bcdd7eb338192d0",
"git_sha": "8556a739676498417d5b323107e8db43089cf303",
"installed_by": ["modules", "vcf_phase_shapeit5"]
},
"shapeit5/phasecommon": {
"branch": "master",
"git_sha": "236d7f19efcffccdfac5e1850af2aa035e0de79c",
"git_sha": "8556a739676498417d5b323107e8db43089cf303",
"installed_by": ["modules", "vcf_phase_shapeit5"]
},
"stitch": {
Expand All @@ -228,7 +228,7 @@
},
"vcflib/vcffixup": {
"branch": "master",
"git_sha": "9268f2ac9d9c520ffcc8eeb1078b4ccc461697b1",
"git_sha": "ecd5df5f44d895a81bda2b47bc5b760596bce72f",
"installed_by": ["modules"]
}
}
Expand Down
8 changes: 4 additions & 4 deletions modules/nf-core/shapeit5/ligate/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 modules/nf-core/shapeit5/ligate/tests/main.nf.test

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

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/vcflib/vcffixup/environment.yml

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

55 changes: 44 additions & 11 deletions modules/nf-core/vcflib/vcffixup/main.nf

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

59 changes: 53 additions & 6 deletions modules/nf-core/vcflib/vcffixup/meta.yml

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

Loading
Loading