Skip to content

Commit 8ad383c

Browse files
committed
Make samplesheet parser tolerable to underscores in enum names
Solves #888
1 parent 65c1658 commit 8ad383c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

micall/tests/test_sample_sheet_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ def test_extra_commas(self):
731731
self.assertEqual(ss["Experiment Name"], "10-Jul-2014")
732732

733733

734-
@unittest.expectedFailure
734+
# @unittest.expectedFailure
735735
def test_underscores_in_sample_name(self):
736736
"""
737737
Extracts the correct project code having multiple options.

micall/utils/sample_sheet_parser.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,11 @@ def sample_sheet_parser(handle):
179179
samp, proj, val = None, None, None
180180
if sample_sheet_version == 1:
181181
sj, val = elem.split(':')
182-
samp, proj = sj.split(project_delimiter_v1)
182+
components = sj.split(project_delimiter_v1)
183+
samp, proj = (project_delimiter_v1.join(components[:-1]), components[-1])
183184
elif sample_sheet_version == 2:
184-
samp, proj, val = elem.split(project_delimiter_v2)
185+
components = elem.split(project_delimiter_v2)
186+
samp, proj, val = (project_delimiter_v2.join(components[:-2]), components[-2], components[-1])
185187

186188
if samp == entry['sample'] and proj == entry['project']:
187189
if name == 'Research':

0 commit comments

Comments
 (0)