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 @@ -199,6 +199,7 @@ Akkatjåkkå is another glacier.
### Added

- [1759](https://github.com/nf-core/sarek/pull/1759) - Back to dev
- [1760](https://github.com/nf-core/sarek/pull/1760) - Add linting of FASTQ with FQ/LINT

### Changed

Expand Down
5 changes: 5 additions & 0 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@
"git_sha": "05954dab2ff481bcb999f24455da29a5828af08d",
"installed_by": ["modules"]
},
"fq/lint": {
"branch": "master",
"git_sha": "2c0260ed80daeca9c6dfa477a4daf04ff336dc37",
"installed_by": ["modules"]
},
"freebayes": {
"branch": "master",
"git_sha": "d04951ee68e3e8b875ebf5ddb7ba6e05233624c1",
Expand Down
5 changes: 5 additions & 0 deletions modules/nf-core/fq/lint/environment.yml

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

44 changes: 44 additions & 0 deletions modules/nf-core/fq/lint/main.nf

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

43 changes: 43 additions & 0 deletions modules/nf-core/fq/lint/meta.yml

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

63 changes: 63 additions & 0 deletions modules/nf-core/fq/lint/tests/main.nf.test

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

25 changes: 25 additions & 0 deletions modules/nf-core/fq/lint/tests/main.nf.test.snap

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

2 changes: 2 additions & 0 deletions modules/nf-core/fq/lint/tests/tags.yml

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

2 changes: 1 addition & 1 deletion nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"fa_icon": "fas fa-forward",
"description": "Disable specified tools.",
"help_text": "Multiple tools can be specified, separated by commas.\n\n> **NB** `--skip_tools baserecalibrator_report` is actually just not saving the reports.\n> **NB** `--skip_tools markduplicates_report` does not skip `MarkDuplicates` but prevent the collection of duplicate metrics that slows down performance.",
"pattern": "^((baserecalibrator|baserecalibrator_report|bcftools|dnascope_filter|documentation|fastqc|haplotypecaller_filter|haplotyper_filter|markduplicates|markduplicates_report|mosdepth|multiqc|samtools|vcftools|versions)?,?)*(?<!,)$"
"pattern": "^((baserecalibrator|baserecalibrator_report|bcftools|dnascope_filter|documentation|fastqc|fq_lint|haplotypecaller_filter|haplotyper_filter|markduplicates|markduplicates_report|mosdepth|multiqc|samtools|vcftools|versions)?,?)*(?<!,)$"
}
},
"fa_icon": "fas fa-user-cog"
Expand Down
15 changes: 15 additions & 0 deletions workflows/sarek/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ include { SPRING_DECOMPRESS as SPRING_DECOMPRESS_TO_R1_FQ } from '../../module
include { SPRING_DECOMPRESS as SPRING_DECOMPRESS_TO_R2_FQ } from '../../modules/nf-core/spring/decompress'
include { SPRING_DECOMPRESS as SPRING_DECOMPRESS_TO_FQ_PAIR } from '../../modules/nf-core/spring/decompress'

// Lint FASTQ with FQ/LINT
include { FQ_LINT } from '../../modules/nf-core/fq/lint/main'

// Run FASTQC
include { FASTQC } from '../../modules/nf-core/fastqc'

Expand Down Expand Up @@ -178,6 +181,18 @@ workflow SAREK {
// Or if we really want users to be able to do that
input_fastq = fastq_gz.mix(CONVERT_FASTQ_INPUT.out.reads).mix(one_fastq_gz_from_spring).mix(two_fastq_gz_from_spring)

// STEP 0: QC & TRIM
// `--skip_tools fq_lint` to skip linting with fq
// `--skip_tools fastqc` to skip fastqc
// Trim only with `--trim_fastq`
// Additional options to be set up

// Lint FASTQ with FQ/LINT
if (params.skip_tools && params.skip_tools.split(',').contains('fq_lint')) {
FQ_LINT(input_fastq)
versions = versions.mix(FQ_LINT.out.versions)
}

// QC
// `--skip_tools fastqc` to skip fastqc
if (!(params.skip_tools && params.skip_tools.split(',').contains('fastqc'))) {
Expand Down
Loading