Skip to content

Commit

Permalink
Merge branch 'hotfix/1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
keiranmraine committed Nov 22, 2017
2 parents 2bc55fb + 7e82675 commit dc8470e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions cgp_seq_input_val/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ def _excel_to_tsv(self, ofh):
formatting_info=False,
on_demand=True,
ragged_rows=True)
if 'For entry' not in book.sheet_names():
raise ParsingError('xls[x] workbooks require the data sheet to be named "For entry"')

sheet = book.sheet_by_name('For entry')
for r in range(0, sheet.nrows):
simplerow = []
Expand Down Expand Up @@ -230,6 +233,10 @@ def __init__(self, manifest):
header_items[row[0]] = val

# now load the ini based on 'Form type:' and 'Form version:'
if 'Form type:' not in header_items:
raise ParsingError('"Form type:" not found in header')
if 'Form version:' not in header_items:
raise ParsingError('"Form version:" not found in header')
self.type = header_items['Form type:']
self.version = header_items['Form version:']
self.uuid = None
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
'url': 'https://github.com/cancerit/cgp_seq_input_val',
'download_url': '',
'author_email': '[email protected]',
'version': '1.2.0',
'version': '1.2.1',
'python_requires': '>= 3.4',
'setup_requires': ['pytest'],
'install_requires': ['progressbar2', 'xlrd'],
Expand Down

0 comments on commit dc8470e

Please sign in to comment.