Skip to content

Commit 1196d17

Browse files
committed
added optional schema url to main.nf and removed duplicate sequencing_center
1 parent b52705a commit 1196d17

3 files changed

Lines changed: 14 additions & 7 deletions

File tree

payload-gen-seq-experiment/main.nf

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ params.experiment_info_tsv = "NO_FILE1"
4949
params.read_group_info_tsv = "NO_FILE2"
5050
params.file_info_tsv = "NO_FILE3"
5151
params.extra_info_tsv = "NO_FILE4"
52-
52+
params.schema_url="NO_FILE5"
5353

5454
process payloadGenSeqExperiment {
5555
container "${params.container ?: container[params.container_registry ?: default_container_registry]}:${params.container_version ?: version}"
@@ -63,6 +63,7 @@ process payloadGenSeqExperiment {
6363
path read_group_info_tsv
6464
path file_info_tsv
6565
path extra_info_tsv
66+
val schema_url
6667

6768
output:
6869
path "*.sequencing_experiment.payload.json", emit: payload
@@ -72,13 +73,14 @@ process payloadGenSeqExperiment {
7273
args_read_group_info_tsv = !read_group_info_tsv.name.startsWith("NO_FILE") ? "-r ${read_group_info_tsv}" : ""
7374
args_file_info_tsv = !file_info_tsv.name.startsWith("NO_FILE") ? "-f ${file_info_tsv}" : ""
7475
args_extra_info_tsv = !extra_info_tsv.name.startsWith("NO_FILE") ? "-e ${extra_info_tsv}" : ""
75-
76+
args_schema_url = !schema_url.startsWith("NO_FILE") ? "-s ${schema_url}" : ""
7677
"""
7778
main.py \
7879
${args_experiment_info_tsv} \
7980
${args_read_group_info_tsv} \
8081
${args_file_info_tsv} \
81-
${args_extra_info_tsv}
82+
${args_extra_info_tsv} \
83+
${args_schema_url}
8284
"""
8385
}
8486

@@ -90,6 +92,7 @@ workflow {
9092
file(params.experiment_info_tsv),
9193
file(params.read_group_info_tsv),
9294
file(params.file_info_tsv),
93-
file(params.extra_info_tsv)
95+
file(params.extra_info_tsv),
96+
params.schema_url
9497
)
9598
}

payload-gen-seq-experiment/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
TSV_FIELDS['experiment']["conditional"]=[
4747
"library_isolation_protocol","library_preparation_kit",
4848
"library_strandedness","rin","dv200","spike_ins_included",
49-
"spike_ins_fasta","spike_ins_concentration","sequencing_center",
49+
"spike_ins_fasta","spike_ins_concentration",
5050
"target_capture_kit"]
5151

5252
TSV_FIELDS['read_group']= {}

payload-gen-seq-experiment/tests/checker.nf

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ params.experiment_info_tsv = "NO_FILE1"
4747
params.read_group_info_tsv = "NO_FILE2"
4848
params.file_info_tsv = "NO_FILE3"
4949
params.extra_info_tsv = "NO_FILE4"
50+
params.schema_url = "NO_FILE5"
5051
params.expected_output = ""
5152

5253
include { payloadGenSeqExperiment } from '../main'
@@ -82,13 +83,15 @@ workflow checker {
8283
file_info_tsv
8384
extra_info_tsv
8485
expected_output
86+
schema_url
8587

8688
main:
8789
payloadGenSeqExperiment(
8890
experiment_info_tsv,
8991
read_group_info_tsv,
9092
file_info_tsv,
91-
extra_info_tsv
93+
extra_info_tsv,
94+
schema_url
9295
)
9396

9497
file_smart_diff(
@@ -104,6 +107,7 @@ workflow {
104107
file(params.read_group_info_tsv),
105108
file(params.file_info_tsv),
106109
file(params.extra_info_tsv),
107-
file(params.expected_output)
110+
file(params.expected_output),
111+
params.schema_url
108112
)
109113
}

0 commit comments

Comments
 (0)