Skip to content

Commit 7b304c3

Browse files
authored
Merge pull request #587 from maxulysse/dev_vep_mix_fix
fix: VEP - Unknown method invocation on ArrayList type
2 parents 20e2872 + 8313f6e commit 7b304c3

2 files changed

Lines changed: 8 additions & 11 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
8484
- [#524](https://github.com/nf-core/sarek/pull/524) - Fix intervals usage by counting the actual list of scatter/gather files produced and not overall number of intervals
8585
- [#549](https://github.com/nf-core/sarek/pull/549) - Fix unique lanes required for Freebayes: issue [#311](https://github.com/nf-core/sarek/issues/311), replaces `meta.clone()` with actual copy of map to avoid issues with <https://nfcore.slack.com/archives/C027CM7P08M/p1644241819942339>
8686
- [#567](https://github.com/nf-core/sarek/pull/567) - Fix interval name resolving during scatter/gather by moving logic to modules.config causing name to be correctly resolved on process execution; also fixed duplicate naming when variant callers produce multiple vcf files by adding field `type` to `meta` map
87-
- [#585](https://github.com/nf-core/sarek/pull/585) - Fix Spark usage for GATK4 modules.
87+
- [#585](https://github.com/nf-core/sarek/pull/585) - Fix Spark usage for GATK4 modules
88+
- [#587](https://github.com/nf-core/sarek/pull/587) - Fix issue with VEP extra files
8889

8990
### Deprecated
9091

workflows/sarek.nf

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,15 @@ vep_cache = params.vep_cache ? Channel.fromPath(params.vep_cac
103103
vep_extra_files = []
104104

105105
if (params.dbnsfp && params.dbnsfp_tbi) {
106-
vep_extra_files = vep_extra_files.mix(
107-
Channel.fromPath(params.dbnsfp),
108-
Channel.fromPath(params.dbnsfp_tbi)
109-
).collect()
106+
vep_extra_files.add(file(params.dbnsfp, checkIfExists: true))
107+
vep_extra_files.add(file(params.dbnsfp_tbi, checkIfExists: true))
110108
}
111109

112110
if (params.spliceai_snv && params.spliceai_snv_tbi && params.spliceai_indel && params.spliceai_indel_tbi) {
113-
vep_extra_files = vep_extra_files.mix(
114-
Channel.fromPath(params.spliceai_indel),
115-
Channel.fromPath(params.spliceai_indel_tbi),
116-
Channel.fromPath(params.spliceai_snv),
117-
Channel.fromPath(params.spliceai_snv_tbi)
118-
).collect()
111+
vep_extra_files.add(file(params.spliceai_indel, checkIfExists: true))
112+
vep_extra_files.add(file(params.spliceai_indel_tbi, checkIfExists: true))
113+
vep_extra_files.add(file(params.spliceai_snv, checkIfExists: true))
114+
vep_extra_files.add(file(params.spliceai_snv_tbi, checkIfExists: true))
119115
}
120116

121117
// Initialize value channels based on params, not defined within the params.genomes[params.genome] scope

0 commit comments

Comments
 (0)