Skip to content

Commit c36da0a

Browse files
authored
Merge pull request #13 from genomematt/1.2.2
Require pandas 0.25.1
2 parents eafc047 + 26442c8 commit c36da0a

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
'matplotlib',
1313
'mpld3',
1414
'numpy',
15-
'pandas',
15+
'pandas>=0.25.1',
1616
'scipy',
1717
'xlrd',
1818
],

survivalvolume/parse.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def clean_studylog_absolute_tv(absolute_tv_df):
137137
return absolute_tv_df.T[3:]
138138

139139
def studylog_absolute_to_tv_tables(xlsx_filename,
140-
sheetname='Absolute TV',
140+
sheetname='Absolute_TV',
141141
header_length=5): #pragma no cover
142142
"""A function for converting study log Prism format Excel files
143143
to dataframes.
@@ -146,7 +146,7 @@ def studylog_absolute_to_tv_tables(xlsx_filename,
146146
147147
xlsx_filename - a Studylog Excel Absolute TV output file
148148
sheetname - the name of the sheet to extract from
149-
Default: 'Absolute TV'
149+
Default: 'Absolute_TV'
150150
151151
Returns:
152152
@@ -157,7 +157,7 @@ def studylog_absolute_to_tv_tables(xlsx_filename,
157157
Note: Raw days are returned - use standardise_days to fix
158158
"""
159159
absolute_df = pandas.read_excel(xlsx_filename,
160-
sheetname=sheetname,
160+
sheet_name=sheetname,
161161
header=header_length)
162162
return studylog_absolute_df_to_tv_tables(absolute_df)
163163

0 commit comments

Comments
 (0)