Skip to content

Commit

Permalink
prepare for version 0.2.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
chfw committed Sep 16, 2016
1 parent 6b68313 commit 3132e87
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
1 change: 1 addition & 0 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ pass on "library" option to get_data and save_data.

plaincsv
pagination
renderer
extendedcsv
csvz
sqlalchemy
Expand Down
4 changes: 2 additions & 2 deletions pyexcel_io.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ extra_dependencies:
- xls:
- pyexcel-xls>=0.2.0
- xlsx:
- pyexcel-xlsx>=0.1.0
- pyexcel-xlsx>=0.2.0
- ods:
- pyexcel-ods3>=0.1.0
- pyexcel-ods3>=0.2.0
description: A python library to read and write structured data in csv, zipped csv format and to/from databases
22 changes: 11 additions & 11 deletions pyexcel_io/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,19 @@
}


def _index_filter(current_index, start, limit=-1):
out_range = constants.SKIP_DATA
if current_index >= start:
out_range = constants.TAKE_DATA
if limit > 0 and out_range == constants.TAKE_DATA:
if current_index >= (start + limit):
out_range = constants.STOP_ITERATION
return out_range


def from_query_sets(column_names, query_sets,
row_renderer=None,
skip_row_func=None, start_row=0, row_limit=-1):
skip_row_func=_index_filter, start_row=0, row_limit=-1):
"""
Convert query sets into an array
"""
Expand Down Expand Up @@ -116,13 +126,3 @@ def resolve_missing_extensions(extension, available_list):
raise NotImplementedError(message)
else:
raise NotImplementedError()


def _index_filter(current_index, start, limit=-1):
out_range = constants.SKIP_DATA
if current_index >= start:
out_range = constants.TAKE_DATA
if limit > 0 and out_range == constants.TAKE_DATA:
if current_index >= (start + limit):
out_range = constants.STOP_ITERATION
return out_range
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
EXTRAS_REQUIRE = {
'xls': ['pyexcel-xls>=0.2.0'],
'xlsx': ['pyexcel-xlsx>=0.1.0'],
'ods': ['pyexcel-ods3>=0.1.0'],
'xlsx': ['pyexcel-xlsx>=0.2.0'],
'ods': ['pyexcel-ods3>=0.2.0'],
}


Expand Down

0 comments on commit 3132e87

Please sign in to comment.