Skip to content

Commit

Permalink
Merge branch 'hotfix/0.7.59'
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonsydes committed Apr 23, 2019
2 parents 08d18d7 + 1843bae commit 1954999
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.58
0.7.59
2 changes: 1 addition & 1 deletion prost/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Autogenerated via git flow.
__version__ = '0.7.58'
__version__ = '0.7.59'
2 changes: 2 additions & 0 deletions prost/excel.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ def create_one(in_prefix, out_prefix, tsv_files):
perform_formatting(sheet, header, num_rows, fmt_percent,
FMT_PERCENT_CONDITIONAL_TWO_COLOR,
FMT_PERCENT_CONDITIONAL_THREE_COLOR)
book.close()
return book_filename

def create_many(in_prefix, out_prefix, tsv_files):
Expand All @@ -465,6 +466,7 @@ def create_many(in_prefix, out_prefix, tsv_files):
perform_formatting(sheet, header, num_rows, fmt_percent,
FMT_PERCENT_CONDITIONAL_TWO_COLOR,
FMT_PERCENT_CONDITIONAL_THREE_COLOR)
book.close()
return book_filenames


Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
# project is installed. For an analysis of "install_requires" vs pip's
# requirements files see:
# https://packaging.python.org/en/latest/technical.html#install-requires-vs-requirements-files
install_requires=['enum34<=1.0.4', 'docopt', 'xlsxwriter', 'psutil'],
install_requires=['enum34<=1.0.4', 'docopt==0.6.2', 'xlsxwriter>=1.1.4,<=1.1.7', 'psutil<=5.6.1'],

# List additional groups of dependencies here (e.g. development dependencies).
# You can install these using the following syntax, for example:
Expand Down

0 comments on commit 1954999

Please sign in to comment.