Skip to content
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

Fix checking whether input files exist #67

Merged
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Initial release of genomic-medicine-sweden/skierfe, created with the [nf-core](h

### `Fixed`

- Fix input file validation [#67](https://github.com/genomic-medicine-sweden/skierfe/pull/67)
- Fix BCFTools merge module inputs [#43](https://github.com/genomic-medicine-sweden/skierfe/pull/43)

### `Dependencies`
Expand Down
3 changes: 3 additions & 0 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ params {
validationSchemaIgnoreParams = 'genomes,igenomes_base'
validationShowHiddenParams = false
validate_params = true
validationSkipDuplicateCheck = false
validationS3PathCheck = false
monochromeLogs = false
}
// Load nf-core custom profiles from different Institutions
try {
Expand Down
55 changes: 42 additions & 13 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@
"type": "string",
"description": "Reference genome",
"pattern": "^.*\\.(fasta|fa|fna)(\\.gz)?$",
"format": "file-path"
"format": "file-path",
"exists": true
},
"genome": {
"type": "string",
Expand Down Expand Up @@ -273,7 +274,8 @@
"format": "file-path",
"description": "Custom config file to supply to MultiQC.",
"fa_icon": "fas fa-cog",
"hidden": true
"hidden": true,
"exists": true
},
"multiqc_logo": {
"type": "string",
Expand All @@ -299,6 +301,21 @@
"description": "Show all params when using `--help`",
"hidden": true,
"help_text": "By default, parameters set as _hidden_ in the schema are not shown on the command line when a user runs with `--help`. Specifying this option will tell the pipeline to show all parameters."
},
"validationSkipDuplicateCheck": {
"type": "boolean",
"hidden": true,
"description": "nf-validation related parameter"
},
"validationS3PathCheck": {
"type": "boolean",
"hidden": true,
"description": "Boolean whether to validate validate AWS S3 paths"
},
"monochromeLogs": {
"type": "boolean",
"hidden": true,
"description": "Boolean whether to color nf-validation logs"
}
}
},
Expand Down Expand Up @@ -351,63 +368,75 @@
"dipcall_par": {
"type": "string",
"description": "Provide a bed file of chrX PAR regions for dipcall",
"format": "file-path"
"format": "file-path",
"exists": true
},
"extra_gvcfs": {
"type": "string",
"description": "Extra input files for GLNexus",
"pattern": "^\\S+\\.csv$",
"format": "file-path",
"schema": "assets/schema_gvcfs.json"
"schema": "assets/schema_gvcfs.json",
"exists": true
},
"extra_snfs": {
"type": "string",
"description": "Extra input files for Sniffles",
"pattern": "^\\S+\\.csv$",
"format": "file-path",
"schema": "assets/schema_snfs.json"
"schema": "assets/schema_snfs.json",
"exists": true
},
"tandem_repeats": {
"type": "string",
"format": "file-path",
"description": "Tandem repeat BED-file for sniffles",
"pattern": "^\\S+\\.bed$"
"pattern": "^\\S+\\.bed$",
"exists": true
},
"trgt_repeats": {
"type": "string",
"description": "BED-file for repeats to be genotyped",
"format": "file-path"
"format": "file-path",
"exists": true
},
"snp_db": {
"type": "string",
"pattern": "^\\S+\\.csv$",
"format": "file-path",
"mimetype": "text/csv",
"schema": "/assets/schema_snpdb.json",
"description": "Extra echtvar-databases to annotate SNVs with"
"description": "Extra echtvar-databases to annotate SNVs with",
"exists": true
},
"vep_cache": {
"type": "string",
"description": "Path to directory of vep_cache",
"format": "directory-path"
"format": "directory-path",
"exists": true
},
"bed": {
"type": "string",
"pattern": "^\\S+\\.bed$",
"format": "file-path",
"description": "BED file with regions of interest"
"description": "BED file with regions of interest",
"exists": true
},
"hificnv_xy": {
"type": "string",
"format": "file-path"
"format": "file-path",
"exists": true
},
"hificnv_xx": {
"type": "string",
"format": "file-path"
"format": "file-path",
"exists": true
},
"hificnv_exclude": {
"type": "string",
"description": "HiFiCNV BED file specifying regions to exclude"
"format": "file-path",
"description": "HiFiCNV BED file specifying regions to exclude",
"exists": true
},
"validationFailUnrecognisedParams": {
"type": "boolean",
Expand Down
2 changes: 2 additions & 0 deletions workflows/skierfe.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/

include { fromSamplesheet } from 'plugin/nf-validation'

// Check mandatory input files
ch_fasta = Channel.fromPath(params.fasta).map { it -> [it.simpleName, it] }.collect()

Expand Down
Loading