-
Notifications
You must be signed in to change notification settings - Fork 35
Adds fq/lint for early validation of FASTQs #67
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
base: dev
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -31,7 +31,6 @@ | |||||
| }, | ||||||
| "outdir": { | ||||||
| "type": "string", | ||||||
| "default": null, | ||||||
| "format": "directory-path", | ||||||
| "description": "The output directory where the results will be saved. You have to use absolute paths to storage on Cloud infrastructure.", | ||||||
| "fa_icon": "fas fa-folder-open" | ||||||
|
|
@@ -51,7 +50,25 @@ | |||||
| "skip_tools": { | ||||||
| "type": "string", | ||||||
| "description": "Comma-separated string of tools to skip", | ||||||
| "pattern": "^((fastqc|fastqscreen|seqfu_stats|seqtk_sample)?,?)*(?<!,)$" | ||||||
| "pattern": "^((fq|fastqc|fastqscreen|seqfu_stats|seqtk_sample)?,?)*(?<!,)$" | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Since we have used the naming convention |
||||||
| } | ||||||
| } | ||||||
| }, | ||||||
| "validation_options": { | ||||||
| "title": "Validation options", | ||||||
| "type": "object", | ||||||
| "description": "Options for validating and screening FASTQ files.", | ||||||
| "default": "", | ||||||
| "properties": { | ||||||
| "fq_lint_args": { | ||||||
| "type": "string", | ||||||
| "description": "Arguments to pass to FQ lint", | ||||||
| "help_text": "Arguments to pass to FQ lint. This can be used to disable overly strict linting. See https://github.com/stjude-rust-labs/fq?tab=readme-ov-file#lint for more information." | ||||||
| }, | ||||||
| "continue_with_lint_fail": { | ||||||
| "type": "boolean", | ||||||
| "description": "Whether to continue with the pipeline if linting fails for a single sample.", | ||||||
| "help_text": "If set to true, the pipeline will continue with the remaining samples if linting fails for a single sample. If set to false, the pipeline will terminate if linting fails for a single sample." | ||||||
| } | ||||||
| } | ||||||
| }, | ||||||
|
|
@@ -250,6 +267,9 @@ | |||||
| { | ||||||
| "$ref": "#/$defs/input_output_options" | ||||||
| }, | ||||||
| { | ||||||
| "$ref": "#/$defs/validation_options" | ||||||
| }, | ||||||
| { | ||||||
| "$ref": "#/$defs/reference_genome_options" | ||||||
| }, | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| nextflow_pipeline { | ||
|
|
||
| name "Test Workflow main.nf on NovaSeq6000 data" | ||
| script "../main.nf" | ||
| tag "seqinspector" | ||
| tag "PIPELINE" | ||
|
|
||
| test("rnaseq data test fail linting") { | ||
|
|
||
| when { | ||
| config "./rnaseq.main.nf.test.config" | ||
| params { | ||
| outdir = "$outputDir" | ||
| } | ||
| } | ||
|
|
||
| then { | ||
| assertAll( | ||
| // Linting should fail! | ||
| { assert workflow.failed } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| test("rnaseq data test skip linting") { | ||
|
|
||
| when { | ||
| config "./rnaseq.main.nf.test.config" | ||
| params { | ||
| outdir = "$outputDir" | ||
| skip_tools = "fq" | ||
| } | ||
| } | ||
|
|
||
| then { | ||
| assertAll( | ||
| { assert workflow.success } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| test("rnaseq data test ignore linting") { | ||
|
|
||
| when { | ||
| config "./rnaseq.main.nf.test.config" | ||
| params { | ||
| outdir = "$outputDir" | ||
| continue_with_lint_fail = true | ||
| } | ||
| } | ||
|
|
||
| then { | ||
| assertAll( | ||
| { assert workflow.success }, | ||
| { assert snapshot( | ||
| path("$outputDir/multiqc/global_report/multiqc_data/multiqc_citations.txt"), | ||
| path("$outputDir/multiqc/global_report/multiqc_data/multiqc_fastqc.txt"), | ||
| path("$outputDir/multiqc/global_report/multiqc_data/multiqc_general_stats.txt") | ||
| ) | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| test("rnaseq data test add args to fq/lint") { | ||
|
|
||
| when { | ||
| config "./rnaseq.main.nf.test.config" | ||
| params { | ||
| outdir = "$outputDir" | ||
| fq_lint_args = "--disable-validator P001" | ||
| } | ||
| } | ||
|
|
||
| then { | ||
| assertAll( | ||
| { assert workflow.success }, | ||
| { assert snapshot( | ||
| path("$outputDir/multiqc/global_report/multiqc_data/multiqc_citations.txt"), | ||
| path("$outputDir/multiqc/global_report/multiqc_data/multiqc_fastqc.txt"), | ||
| path("$outputDir/multiqc/global_report/multiqc_data/multiqc_general_stats.txt") | ||
| ) | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| // Load the basic test config | ||
| includeConfig 'nextflow.config' | ||
|
|
||
| // Load the correct samplesheet for that test | ||
| params { | ||
| input = params.pipelines_testdata_base_path + '626c8fab639062eade4b10747e919341cbf9b41a/samplesheet/v3.10/samplesheet_test.csv' | ||
|
|
||
| } |
Uh oh!
There was an error while loading. Please reload this page.