Skip to content

Commit e3ca65a

Browse files
authored
Merge pull request #647 from broadinstitute/fix-viral-ngs-3x-illumina-import
fix: update illumina import for viral-ngs 3.x namespace restructure
2 parents 67d3340 + cf6f0ee commit e3ca65a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pipes/WDL/tasks/tasks_demux.wdl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ task illumina_demux {
343343
# the presence of a barcode_3 column with values in at least some of the rows.
344344
# We can lean on a Python call out to the SampleSheet class in illumina for this.
345345
collapse_duplicated_barcodes="false"
346-
sample_sheet_barcode_collapse_potential=$(python -c 'import os; import illumina as il; ss=il.SampleSheet(os.path.realpath("~{samplesheet}"),allow_non_unique=True, collapse_duplicates=False); ssc=il.SampleSheet(os.path.realpath("~{samplesheet}"),allow_non_unique=True, collapse_duplicates=True); print("sheet_collapse_possible_true") if len(ss.get_rows())!=len(ssc.get_rows()) else print("sheet_collapse_possible_false")')
346+
sample_sheet_barcode_collapse_potential=$(python -c 'import os; import viral_ngs.illumina as il; ss=il.SampleSheet(os.path.realpath("~{samplesheet}"),allow_non_unique=True, collapse_duplicates=False); ssc=il.SampleSheet(os.path.realpath("~{samplesheet}"),allow_non_unique=True, collapse_duplicates=True); print("sheet_collapse_possible_true") if len(ss.get_rows())!=len(ssc.get_rows()) else print("sheet_collapse_possible_false")')
347347
if [[ "$sample_sheet_barcode_collapse_potential" == "sheet_collapse_possible_true" ]]; then
348348
collapse_duplicated_barcodes="true"
349349
collapsed_barcodes_output_samplesheet_arg="--collapse_duplicated_barcodes=barcodes_if_collapsed.tsv"
@@ -356,7 +356,7 @@ task illumina_demux {
356356
357357
# dump sample names from input sample sheet 'sample' col to sample_names.txt
358358
sample_names_expected_from_samplesheet_list_txt="sample_names.txt"
359-
python -c 'import os; import illumina as il; ss=il.SampleSheet(os.path.realpath("~{samplesheet}"),allow_non_unique=True, collapse_duplicates=False); sample_name_list=[r["sample"]+"\n" for r in ss.get_rows()]; f=open("'${sample_names_expected_from_samplesheet_list_txt}'", "w"); f.writelines(sample_name_list); f.close()'
359+
python -c 'import os; import viral_ngs.illumina as il; ss=il.SampleSheet(os.path.realpath("~{samplesheet}"),allow_non_unique=True, collapse_duplicates=False); sample_name_list=[r["sample"]+"\n" for r in ss.get_rows()]; f=open("'${sample_names_expected_from_samplesheet_list_txt}'", "w"); f.writelines(sample_name_list); f.close()'
360360
361361
cols_to_revcomp="~{sep=' ' select_first([barcode_columns_to_rev_comp,[default_revcomp_barcode_column]])}"
362362

0 commit comments

Comments
 (0)