Skip to content

Commit a007d56

Browse files
authored
Merge pull request #1528 from glichtenstein/json-schema-improvements
Json schema improvements
2 parents e2f6505 + 60c50eb commit a007d56

File tree

3 files changed

+90
-61
lines changed

3 files changed

+90
-61
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
- [PR #1496](https://github.com/nf-core/rnaseq/pull/1496) - Template update for nf-core/tools v3.2.0
1717
- [PR #1499](https://github.com/nf-core/rnaseq/pull/1499) - Bump MultiQC module to 1.27
1818
- [PR #1508](https://github.com/nf-core/rnaseq/pull/1508) - Fix missing Bracken results in the MultiQC report
19+
- [PR #1528](https://github.com/nf-core/rnaseq/pull/1528) - Improve JSON schema validation files
1920
- [PR #1523](https://github.com/nf-core/rnaseq/pull/1523) - Update preprocessing subworkflow to fix linting block on trimming
2021
- [PR #1521](https://github.com/nf-core/rnaseq/pull/1521) - Updated Perl conda package version for local module gtf2bed for Arm compatibility.
2122

assets/schema_input.json

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@
1818
"format": "file-path",
1919
"exists": true,
2020
"pattern": "^\\S+\\.f(ast)?q\\.gz$",
21-
"errorMessage": "FastQ file for reads 1 must be provided, cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'"
21+
"errorMessage": "GZIP-compressed FastQ file for reads 1 must be provided, cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'"
2222
},
2323
"fastq_2": {
24-
"errorMessage": "FastQ file for reads 2 cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'",
2524
"type": "string",
2625
"format": "file-path",
2726
"exists": true,
28-
"anyOf": [
29-
{
30-
"pattern": "^\\S+\\.f(ast)?q\\.gz$"
31-
},
32-
{
33-
"maxLength": 0
34-
}
35-
]
27+
"pattern": "^\\S+\\.f(ast)?q\\.gz$",
28+
"errorMessage": "GZIP-compressed FastQ file for reads 2 cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'"
3629
},
3730
"strandedness": {
3831
"type": "string",

0 commit comments

Comments
 (0)