Skip to content

Commit 317e170

Browse files
authored
Merge pull request #52 from pyexcel/dev
Release 0.5.9
2 parents 59ac347 + 9a5a463 commit 317e170

32 files changed

+653
-701
lines changed

CHANGELOG.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
Change log
22
================================================================================
33

4+
0.5.9 - 23.08.2018
5+
--------------------------------------------------------------------------------
6+
7+
added
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `pyexcel#148 <https://github.com/pyexcel/pyexcel/issues/148>`_, support
11+
force_file_type
12+
413
0.5.8 - 16.08.2018
514
--------------------------------------------------------------------------------
615

7-
fixed
16+
added
817
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
918

1019
#. `#49 <https://github.com/pyexcel/pyexcel-io/issues/49>`_, support additional

changelog.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ name: pyexcel-io
22
organisation: pyexcel
33
releases:
44
- changes:
5-
- action: fixed
5+
- action: added
6+
details:
7+
- '`pyexcel#148`, support force_file_type'
8+
date: 23.08.2018
9+
version: 0.5.9
10+
- changes:
11+
- action: added
612
details:
713
- '`#49`, support additional options when detecting float values in csv format. default_float_nan, ignore_nan_text'
814
date: 16.08.2018

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
author = u'C.W.'
3030

3131
# The short X.Y version
32-
version = u'0.5.8'
32+
version = u'0.5.9'
3333
# The full version, including alpha/beta/rc tags
34-
release = u'0.5.8'
34+
release = u'0.5.9'
3535

3636

3737
# -- General configuration ---------------------------------------------------

pyexcel-io.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
overrides: "pyexcel.yaml"
22
name: "pyexcel-io"
33
nick_name: io
4-
version: 0.5.8
5-
current_version: 0.5.8
6-
release: 0.5.8
4+
version: 0.5.9
5+
current_version: 0.5.9
6+
release: 0.5.9
77
dependencies:
88
- ordereddict;python_version<"2.7"
99
- lml==0.0.1

pyexcel_io/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
BLACK_LIST = [__name__, "pyexcel_webio", "pyexcel_text"]
2020
WHITE_LIST = [
21-
"pyexcel_io.readers", "pyexcel_io.writers", "pyexcel_io.database"
21+
"pyexcel_io.readers",
22+
"pyexcel_io.writers",
23+
"pyexcel_io.database",
2224
]
2325
PREFIX = "pyexcel_"
2426

pyexcel_io/_compact.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
except ImportError:
3434

3535
class NullHandler(logging.Handler):
36-
3736
def emit(self, record):
3837
pass
3938

@@ -46,7 +45,6 @@ def emit(self, record):
4645
irange = xrange
4746

4847
class Iterator(object):
49-
5048
def next(self):
5149
return type(self).__next__(self)
5250

pyexcel_io/book.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class RWInterface(object):
1616
"""
1717
The common methods for book reader and writer
1818
"""
19+
1920
stream_type = None
2021

2122
def __init__(self):

pyexcel_io/constants.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,21 @@
1616
MESSAGE_ERROR_02 = "No content, file name. Nothing is given"
1717
MESSAGE_ERROR_03 = "cannot handle unknown content"
1818
MESSAGE_WRONG_IO_INSTANCE = "Wrong io instance is passed for your file format."
19-
MESSAGE_CANNOT_WRITE_STREAM_FORMATTER = "Cannot write content of file type %s to stream"
20-
MESSAGE_CANNOT_READ_STREAM_FORMATTER = "Cannot read content of file type %s from stream"
21-
MESSAGE_CANNOT_WRITE_FILE_TYPE_FORMATTER = "Cannot write content of file type %s to file %s"
22-
MESSAGE_CANNOT_READ_FILE_TYPE_FORMATTER = "Cannot read content of file type %s from file %s"
23-
MESSAGE_LOADING_FORMATTER = "The plugin for file type %s is not installed. Please install %s"
19+
MESSAGE_CANNOT_WRITE_STREAM_FORMATTER = (
20+
"Cannot write content of file type %s to stream"
21+
)
22+
MESSAGE_CANNOT_READ_STREAM_FORMATTER = (
23+
"Cannot read content of file type %s from stream"
24+
)
25+
MESSAGE_CANNOT_WRITE_FILE_TYPE_FORMATTER = (
26+
"Cannot write content of file type %s to file %s"
27+
)
28+
MESSAGE_CANNOT_READ_FILE_TYPE_FORMATTER = (
29+
"Cannot read content of file type %s from file %s"
30+
)
31+
MESSAGE_LOADING_FORMATTER = (
32+
"The plugin for file type %s is not installed. Please install %s"
33+
)
2434
MESSAGE_EMPTY_ARRAY = "One empty row is found"
2535
MESSAGE_IGNORE_ROW = "One row is ignored"
2636
MESSAGE_DB_EXCEPTION = """
@@ -47,5 +57,5 @@
4757
DEFAULT_MULTI_CSV_SEPARATOR = "__"
4858
SEPARATOR_FORMATTER = "---%s---" % DEFAULT_NAME + "%s"
4959
SEPARATOR_MATCHER = "---%s:(.*)---" % DEFAULT_NAME
50-
DEFAULT_CSV_STREAM_FILE_FORMATTER = ("---%s:" % DEFAULT_NAME + "%s---%s")
60+
DEFAULT_CSV_STREAM_FILE_FORMATTER = "---%s:" % DEFAULT_NAME + "%s---%s"
5161
DEFAULT_CSV_NEWLINE = "\r\n"

pyexcel_io/database/importers/django.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ def create_sheet(self, sheet_name):
8181
)
8282
else:
8383
raise Exception(
84-
"Sheet: %s does not match any given models."
85-
% sheet_name
84+
"Sheet: %s does not match any given models." % sheet_name
8685
+ "Please be aware of case sensitivity."
8786
)
8887

pyexcel_io/database/importers/sqlalchemy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class PyexcelSQLSkipRowException(Exception):
1818
Raised this exception to skipping a row
1919
while data import
2020
"""
21+
2122
pass
2223

2324

@@ -93,8 +94,7 @@ def create_sheet(self, sheet_name):
9394
)
9495
else:
9596
raise Exception(
96-
"Sheet: %s does not match any given tables."
97-
% sheet_name
97+
"Sheet: %s does not match any given tables." % sheet_name
9898
+ "Please be aware of case sensitivity."
9999
)
100100

0 commit comments

Comments
 (0)