Skip to content

Commit 1c364d3

Browse files
authored
Merge pull request #1 from kedhammar/dev
Some additions
2 parents 38e39a9 + 49484f3 commit 1c364d3

File tree

12 files changed

+61
-23
lines changed

12 files changed

+61
-23
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ First, prepare a samplesheet with your input data that looks as follows:
4545

4646
```csv
4747
sample,fastq_1,fastq_2,rundir,tags
48-
CONTROL_REP1,AEG588A1_S1_L002_R1_001.fastq.gz,AEG588A1_S1_L002_R2_001.fastq.gz,200624_A00834_0183_BHMTFYDRXX,group1
48+
CONTROL_REP1,AEG588A1_S1_L002_R1_001.fastq.gz,AEG588A1_S1_L002_R2_001.fastq.gz,200624_A00834_0183_BHMTFYDRXX,lane1:project5:group2
4949
```
5050

5151
Each row represents a fastq file (single-end) or a pair of fastq files (paired end).

assets/schema_input.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
},
3737
"tags": {
3838
"type": "string",
39-
"pattern": "^([A-Za-z0-9_-]+:)*([A-Za-z0-9_-]+)$",
40-
"errorMessage": "Tags must consist of numbers, letters, underscores or dashes and must be provided as a column-separated list, e.g. group_01:lane1:pos-CTRL_2.",
39+
"pattern": "^([a-z0-9_-]+:)*([a-z0-9_-]+)$",
40+
"errorMessage": "Tags must be separated by colons and only consist of lowercase letters, numbers, underscores and hyphens.",
4141
"meta": ["tags"]
4242
}
4343
},

conf/test.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ params {
2222
// Input data
2323
// TODO nf-core: Specify the paths to your test data on nf-core/test-datasets
2424
// TODO nf-core: Give any required params for the test so that command line flags are not needed
25-
input = params.pipelines_testdata_base_path + 'seqinspector/testdata/MiSeq/samplesheet.csv'
25+
input = params.pipelines_testdata_base_path + 'seqinspector/testdata/NovaSeq6000/samplesheet.csv'
2626

2727
// Genome references
2828
genome = 'R64-1-1'

docs/usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ sample4 path/to/run_dir/sample4_lane2_group3_r1.fq.gz path/to/run_dir co
4444
| `sample` | Custom sample name. This entry will be identical for multiple sequencing libraries/runs from the same sample. Spaces in sample names are automatically converted to underscores (`_`). |
4545
| `fastq_1` | Full path to FastQ file for Illumina short reads 1. File has to be gzipped and have the extension ".fastq.gz" or ".fq.gz". |
4646
| `fastq_2` | Full path to FastQ file for Illumina short reads 2. File has to be gzipped and have the extension ".fastq.gz" or ".fq.gz" (optional). |
47-
| `rundir` | Path to the runfolder containing extra information about the sequencing run (optional) . |
48-
| `tags` | Column-separated list of tags to group samples in special reports. |
47+
| `rundir` | Path to the runfolder containing extra information about the sequencing run (optional). |
48+
| `tags` | Colon-separated list of tags to group samples in special reports. |
4949

5050
Another [example samplesheet](../assets/samplesheet.csv) has been provided with the pipeline.
5151

modules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"multiqc": {
1414
"branch": "master",
15-
"git_sha": "b7ebe95761cd389603f9cc0e0dc384c0f663815a",
15+
"git_sha": "19ca321db5d8bd48923262c2eca6422359633491",
1616
"installed_by": ["modules"]
1717
}
1818
}

modules/nf-core/multiqc/environment.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/nf-core/multiqc/main.nf

Lines changed: 11 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/nf-core/multiqc/meta.yml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/nf-core/multiqc/tests/main.nf.test

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/nf-core/multiqc/tests/main.nf.test.snap

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)