File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2,4 +2,4 @@ channels:
22 - conda-forge
33 - bioconda
44dependencies :
5- - sr2silo=1.1 .0
5+ - sr2silo=1.3 .0
Original file line number Diff line number Diff line change @@ -199,15 +199,15 @@ rule silo_preprocess:
199199 """
200200 input :
201201 nuc_alignment = alignment_wildcard ,
202- timeline_file = (
203- config .tallymut .get ("timeline_file" , None ) or cohortdir ("timeline.tsv" )
204- )
205202 output :
206203 silo_input = "{dataset}/alignments/silo_input.ndjson.zst" ,
207204 params :
208205 s_rec = get_s_rec ,
209206 SR2SILO = config ["applications" ]["sr2silo" ],
210207 lapis_url = config ["loculus" ]["lapis-url" ],
208+ timeline_file = (
209+ config .tallymut .get ("timeline_file" , None ) or cohortdir ("timeline.tsv" )
210+ ),
211211 log :
212212 outfile = "{dataset}/alignments/silo_input.out.log" ,
213213 errfile = "{dataset}/alignments/silo_input.out.err" ,
@@ -240,9 +240,9 @@ if config.loculus["local"]:
240240
241241rule silo_upload :
242242 input :
243- silo_input = "{dataset}/alignments/silo_input .ndjson.zst" ,
243+ silo_input = "{dataset}/alignments/" + f"/sampleId- { sample_id } .ndjson.zst", ,
244244 output :
245- flag = "{dataset}/alignments/silo_input .uploaded" ,
245+ flag = "{dataset}/alignments/" + f"sampleId-{{sample_id}} .uploaded" ,
246246 params :
247247 s_rec = get_s_rec ,
248248 keycloak_token_url = config ["loculus" ]["keycloak_token_url" ],
You can’t perform that action at this time.
0 commit comments