-
Notifications
You must be signed in to change notification settings - Fork 423
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
modules config update - preprocessing refactor #485
Conversation
@@ -89,7 +89,7 @@ chr_dir = params.chr_dir ? Channel.fromPath(params.chr_dir). | |||
chr_length = params.chr_length ? Channel.fromPath(params.chr_length).collect() : [] | |||
dbsnp = params.dbsnp ? Channel.fromPath(params.dbsnp).collect() : Channel.empty() | |||
fasta = params.fasta ? Channel.fromPath(params.fasta).collect() : [] | |||
germline_resource = params.germline_resource ? Channel.fromPath(params.germline_resource).collect() : [] | |||
germline_resource = params.germline_resource ? Channel.fromPath(params.germline_resource).collect() : Channel.empty() |
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.
What is the difference again using []
and Channel.empty()
?
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.
not sure, but it wasn't working
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.
When creating a process input set, using Channel.empty()
won't trigger the process to run, but if you give it []
, the process runs with []
as the value for the corresponding parameter.
That's why channel.ifEmpty([])
is used so much for MULTIQC.
… + skip_markduplicates + skip_bqsr) into skip_tools
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
Stopping the refactoring here not to have a PR so huge it's a black hole that will swallow all the code reviewers |
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.
looks good to me, not sure why the CI tests are not passing. only the variant_calling one should fail.
OK, I'll figure out the rest of the CI and then call it a day |
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
umi { | ||
params.input = "${baseDir}/tests/csv/3.0/fastq_umi.csv" | ||
params.umi_read_structure = '7M1S+T' | ||
} | ||
use_gatk_spark { | ||
params.use_gatk_spark = 'baserecalibrator,markduplicates' | ||
} | ||
} | ||
|
||
//This is apparently useless as it won't overwrite things in the modules.config | ||
process { |
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.
Think we can delete this now, no?
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.
Why not, we still want to test this no?
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.
it doesn't get overwritten but will need to be moved to the modules.config and activated somehow on test
Only gatkspark test falling (on top on the previously variant calling too), but can't manage to make it work on my computer, and figure the current dev is actually not running gatk spark... |
Markdown linting is failingTo keep the code consistent with lots of contributors, we run automated code consistency checks.
Once you push these changes the test should pass, and you can hide this comment 👍 We highly recommend setting up markdownlint in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help! Thanks again for your contribution! |
params.publish_dir_mode
--skip_qc
,--skip_markduplicates
and--skip_bqsr
into--skip_tools
ext.when
for modules in all current subworkflowsannotate.nf
bam2fastq.nf
germline_variant_calling.nf
mapping_csv.nf
markduplicates_csv.nf
pair_copy_number_calling.nf
pair_variant_calling.nf
prepare_genome.nf
prepare_intervals.nf
prepare_recalibration_csv.nf
recalibrate_csv.nf
split_fastq.nf
tumor_variant_calling.nf
fastqc_trimgalore.nf
markduplicates.nf
prepare_recalibration.nf
recalibrate.nf
annotation_ensemblvep/main.nf
annotation_snpeff/main.nf
fgbio_create_umi_consensus/main.nf
gatk4_mapping/main.nf
gatk_tumor_normal_somatic_variant_calling/main.nf
gatk_tumor_only_somatic_variant_calling/main.nf
joint_germline_variant_calling/main.nf