From 5afbe747f459d0b04a45e88b4552f6397ba0dddf Mon Sep 17 00:00:00 2001 From: chfw Date: Thu, 8 Oct 2020 00:22:38 +0100 Subject: [PATCH] :bug: try support pyexcel-xls 0.4.1 on python 3.6. fix #94 --- changelog.yml | 6 ++++++ docs/source/common_parameters.rst | 4 ++-- docs/source/conf.py | 4 ++-- pyexcel-io.yml | 6 +++--- pyexcel_io/_compact.py | 2 ++ setup.py | 8 ++++---- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/changelog.yml b/changelog.yml index 0e0039b..cdff924 100644 --- a/changelog.yml +++ b/changelog.yml @@ -1,6 +1,12 @@ name: pyexcel-io organisation: pyexcel releases: +- changes: + - action: updated + details: + - "`#94`: keep backward compatibility for pyexcel-xls 0.4.1" + version: 0.6.2 + date: 7.10.2020 - changes: - action: removed details: diff --git a/docs/source/common_parameters.rst b/docs/source/common_parameters.rst index 3ec67af..70e01c9 100644 --- a/docs/source/common_parameters.rst +++ b/docs/source/common_parameters.rst @@ -5,12 +5,12 @@ Common parameters 'library' option is added -------------------------------------------------------------------------------- -In order to have overlapping plugins co-exit, 'library' option is added to +In order to have overlapping plugins co-exist, 'library' option is added to get_data and save_data. get_data only parameters -------------------------------- +-------------------------------------------------------------------------------- keep_trailing_empty_cells ******************************************************************************** diff --git a/docs/source/conf.py b/docs/source/conf.py index a30ee98..2828238 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -26,9 +26,9 @@ project = 'pyexcel-io' copyright = '2015-2020 Onni Software Ltd.' author = 'chfw' # The short X.Y version -version = '0.6.1' +version = '0.6.2' # The full version, including alpha/beta/rc tags -release = '0.6.1' +release = '0.6.2' # -- General configuration --------------------------------------------------- diff --git a/pyexcel-io.yml b/pyexcel-io.yml index 8c837d9..8e44348 100644 --- a/pyexcel-io.yml +++ b/pyexcel-io.yml @@ -2,9 +2,9 @@ overrides: "pyexcel.yaml" project: "pyexcel-io" name: pyexcel-io nick_name: io -version: 0.6.1 -current_version: 0.6.1 -release: 0.6.1 +version: 0.6.2 +current_version: 0.6.2 +release: 0.6.2 copyright_year: 2015-2020 moban_command: false is_on_conda: true diff --git a/pyexcel_io/_compact.py b/pyexcel_io/_compact.py index 90ebd3a..1e0fa18 100644 --- a/pyexcel_io/_compact.py +++ b/pyexcel_io/_compact.py @@ -7,6 +7,7 @@ :copyright: (c) 2014-2020 by Onni Software Ltd. :license: New BSD License, see LICENSE for more details """ +import sys import logging from io import BytesIO, StringIO # noqa: F401 from collections import OrderedDict # noqa: F401 @@ -22,6 +23,7 @@ except ImportError: text_type = str irange = range +PY2 = sys.version[0] == 2 def isstream(instance): diff --git a/setup.py b/setup.py index 0b9a547..c03f51a 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ except (ValueError, UnicodeError, locale.Error): NAME = "pyexcel-io" AUTHOR = "chfw" -VERSION = "0.6.1" +VERSION = "0.6.2" EMAIL = "info@pyexcel.org" LICENSE = "New BSD" DESCRIPTION = ( @@ -40,7 +40,7 @@ DESCRIPTION = ( "format and to/from databases" ) URL = "https://github.com/pyexcel/pyexcel-io" -DOWNLOAD_URL = "%s/archive/0.6.1.tar.gz" % URL +DOWNLOAD_URL = "%s/archive/0.6.2.tar.gz" % URL FILES = ["README.rst", "CHANGELOG.rst"] KEYWORDS = [ "python", @@ -85,8 +85,8 @@ EXTRAS_REQUIRE = { } # You do not need to read beyond this line PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable) -GS_COMMAND = ("gs pyexcel-io v0.6.1 " + - "Find 0.6.1 in changelog for more details") +GS_COMMAND = ("gs pyexcel-io v0.6.2 " + + "Find 0.6.2 in changelog for more details") NO_GS_MESSAGE = ("Automatic github release is disabled. " + "Please install gease to enable it.") UPLOAD_FAILED_MSG = (