Skip to content

Commit 850b37b

Browse files
authored
Merge pull request #58 from nf-core/bug-fix-shcema-pattern
samplesheet schema pattern fix, and end-to-end snapshot updated
2 parents 0626ecb + ce0e0bc commit 850b37b

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

assets/schema_input.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"type": "string",
1818
"format": "file-path",
1919
"exists": true,
20-
"pattern": "^([\\S\\s]*\\/)?[^\\s\\/]+\\.f(ast)?q\\.gz$",
21-
"errorMessage": "Fasta file for each sample must be provided, cannot contain spaces and must have extension '.fa.gz', '.fa', '.fasta', or '.fasta.gz'"
20+
"pattern": "^([\\S\\s]*\\/)?[^\\s\\/]+\\.(fa|fasta|faa|fas)(\\.gz)?$",
21+
"errorMessage": "Fasta file for each sample must be provided, cannot contain spaces and must have extension '.faa', '.fa', '.fas' or '.fasta', and optionally be compressed (.gz)"
2222
}
2323
},
2424
"required": ["id", "fasta"]

tests/default.nf.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ nextflow_pipeline {
2727
assertAll(
2828
{ assert workflow.success},
2929
{ assert snapshot(
30+
// Number of successful tasks
31+
workflow.trace.succeeded().size(),
3032
// pipeline versions.yml file for multiqc from which Nextflow version is removed because we test pipelines on multiple Nextflow versions
3133
removeNextflowVersion("$outputDir/pipeline_info/nf_core_proteinannotator_software_mqc_versions.yml"),
3234
// All stable path name, with a relative path

tests/default.nf.test.snap

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
[
1414
"multiqc",
1515
"multiqc/multiqc_data",
16+
"multiqc/multiqc_data/llms-full.txt",
1617
"multiqc/multiqc_data/multiqc.log",
18+
"multiqc/multiqc_data/multiqc.parquet",
1719
"multiqc/multiqc_data/multiqc_citations.txt",
1820
"multiqc/multiqc_data/multiqc_data.json",
1921
"multiqc/multiqc_data/multiqc_software_versions.txt",
@@ -26,19 +28,15 @@
2628
"seqkit/T1026.tsv"
2729
],
2830
[
29-
"multiqc.log:md5,e53e3d119c66404ce20772bed762a05f",
3031
"multiqc_citations.txt:md5,4c806e63a283ec1b7e78cdae3a923d4f",
31-
"multiqc_data.json:md5,24edddc3d41115fe71cc9a7d9092ca96",
32-
"multiqc_software_versions.txt:md5,c5b754560c24cc8da0c1e92febf6f37f",
33-
"multiqc_sources.txt:md5,d2a044df39ce3c6abe5cdc2d67473490",
3432
"T1024.tsv:md5,c8a3fd71b27b9455aa837e1d50026971",
3533
"T1026.tsv:md5,b028126e117cf0979b6f907cb20c6958"
3634
]
3735
],
3836
"meta": {
39-
"nf-test": "0.9.2",
40-
"nextflow": "25.04.1"
37+
"nf-test": "0.9.3",
38+
"nextflow": "25.10.2"
4139
},
42-
"timestamp": "2025-06-03T17:59:05.58411"
40+
"timestamp": "2025-12-01T13:29:43.423448494"
4341
}
4442
}

0 commit comments

Comments
 (0)