Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup Nextflow
uses: nf-core/setup-nextflow@v1
with:
version: "latest-edge"
version: "latest-stable"

- name: Install nf-test
run: |
Expand Down
2 changes: 2 additions & 0 deletions modules/local/qc_filter_genotyped.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ process QC_FILTER_GENOTYPED {

input:
tuple val(genotyped_plink_filename), path(genotyped_plink_file)
path phenotypes_file

output:
path "${genotyped_plink_filename}.qc.log"
Expand All @@ -15,6 +16,7 @@ process QC_FILTER_GENOTYPED {
"""
plink2 \
--bfile ${genotyped_plink_filename} \
--keep ${phenotypes_file} \
--maf ${params.qc_maf} \
--mac ${params.qc_mac} \
--geno ${params.qc_geno} \
Expand Down
2 changes: 0 additions & 2 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ profiles {

docker {
docker.enabled = true
docker.userEmulation = true
singularity.enabled = false
}

Expand All @@ -139,7 +138,6 @@ profiles {
development {
process.container = 'genepi/nf-gwas:latest'
docker.enabled = true
docker.userEmulation = true
resume = true
singularity.enabled = false
}
Expand Down
1 change: 1 addition & 0 deletions tests/modules/local/qc_filter_genotyped.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ nextflow_process {
process {
"""
input[0] = Channel.fromFilePairs("$projectDir/tests/input/pipeline/example.{bim,bed,fam}", size: 3)
input[1] = file("$projectDir/tests/input/pipeline/phenotype.txt")
"""
}
}
Expand Down
2 changes: 1 addition & 1 deletion workflows/gene_based_tests.nf
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ workflow GENE_BASED_TESTS {

if (!skip_predictions) {

QUALITY_CONTROL(genotyped_plink_ch)
QUALITY_CONTROL(genotyped_plink_ch, phenotypes_file_validated)
genotyped_final_ch = QUALITY_CONTROL.out.genotyped_filtered_files_ch
genotyped_filtered_snplist_ch = QUALITY_CONTROL.out.genotyped_filtered_snplist_ch
genotyped_filtered_id_ch = QUALITY_CONTROL.out.genotyped_filtered_id_ch
Expand Down
6 changes: 4 additions & 2 deletions workflows/quality_control.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ include { QC_FILTER_GENOTYPED } from '../modules/local/qc_filter_genotyped'
workflow QUALITY_CONTROL {

take:
genotyped_plink_ch
genotyped_plink_ch
phenotypes_file_validated

main:

QC_FILTER_GENOTYPED (
genotyped_plink_ch
genotyped_plink_ch,
phenotypes_file_validated
)

emit:
Expand Down
2 changes: 1 addition & 1 deletion workflows/single_variant_tests.nf
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ workflow SINGLE_VARIANT_TESTS {

if (!skip_predictions) {

QUALITY_CONTROL(genotyped_plink_ch)
QUALITY_CONTROL(genotyped_plink_ch, phenotypes_file_validated)
genotyped_final_ch = QUALITY_CONTROL.out.genotyped_filtered_files_ch
genotyped_filtered_snplist_ch = QUALITY_CONTROL.out.genotyped_filtered_snplist_ch
genotyped_filtered_id_ch = QUALITY_CONTROL.out.genotyped_filtered_id_ch
Expand Down