From 56fa0ace8cd2793b6bbd8c2986c6410074214373 Mon Sep 17 00:00:00 2001 From: chfw Date: Thu, 28 Sep 2017 23:16:54 +0100 Subject: [PATCH] :handshake: sync with pyexcel-commons --- .moban.d/docs/source/index.rst | 2 +- README.rst | 10 +++++++++- docs/source/index.rst | 12 ++++++++++-- setup.py | 5 +++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.moban.d/docs/source/index.rst b/.moban.d/docs/source/index.rst index 7870a04..8b9c737 100644 --- a/.moban.d/docs/source/index.rst +++ b/.moban.d/docs/source/index.rst @@ -57,7 +57,7 @@ get_data(.., library='pyexcel-ods') ============= ======= ======== ======= ======== ======== ======== `pyexcel-io`_ `xls`_ `xlsx`_ `ods`_ `ods3`_ `odsr`_ `xlsxw`_ ============= ======= ======== ======= ======== ======== ======== - 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 + 0.5.1 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 0.4.x 0.4.x 0.4.x 0.4.x 0.4.x 0.4.x 0.4.x 0.3.0+ 0.3.0+ 0.3.0 0.3.0+ 0.3.0+ 0.3.0 0.3.0 0.2.2+ 0.2.2+ 0.2.2+ 0.2.1+ 0.2.1+ 0.0.1 diff --git a/README.rst b/README.rst index 423cd70..7715717 100644 --- a/README.rst +++ b/README.rst @@ -60,14 +60,22 @@ sqlalchemy supported databases. Its supported file formats are extended to cover `pyexcel-xls`_ xls, xlsx(read only), `xlrd`_, same as above xlsm(read only) `xlwt`_ `pyexcel-xlsx`_ xlsx `openpyxl`_ same as above - `pyexcel-xlsxw`_ xlsx(write only) `XlsxWriter`_ same as above `pyexcel-ods3`_ ods `pyexcel-ezodf`_, 2.6, 2.7, 3.3, 3.4 lxml 3.5, 3.6 `pyexcel-ods`_ ods `odfpy`_ same as above + ======================== ======================= ================= ================== + +.. table:: Dedicated file reader and writers + + ======================== ======================= ================= ================== + Package name Supported file formats Dependencies Python versions + ======================== ======================= ================= ================== + `pyexcel-xlsxw`_ xlsx(write only) `XlsxWriter`_ Python 2 and 3 `pyexcel-odsr`_ read only for ods, fods lxml same as above `pyexcel-htmlr`_ html(read only) lxml,html5lib same as above ======================== ======================= ================= ================== + .. _pyexcel-io: https://github.com/pyexcel/pyexcel-io .. _pyexcel-xls: https://github.com/pyexcel/pyexcel-xls .. _pyexcel-xlsx: https://github.com/pyexcel/pyexcel-xlsx diff --git a/docs/source/index.rst b/docs/source/index.rst index 16ed919..e3fca97 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -72,14 +72,22 @@ For individual excel file formats, please install them as you wish: `pyexcel-xls`_ xls, xlsx(read only), `xlrd`_, same as above xlsm(read only) `xlwt`_ `pyexcel-xlsx`_ xlsx `openpyxl`_ same as above - `pyexcel-xlsxw`_ xlsx(write only) `XlsxWriter`_ same as above `pyexcel-ods3`_ ods `pyexcel-ezodf`_, 2.6, 2.7, 3.3, 3.4 lxml 3.5, 3.6 `pyexcel-ods`_ ods `odfpy`_ same as above + ======================== ======================= ================= ================== + +.. table:: Dedicated file reader and writers + + ======================== ======================= ================= ================== + Package name Supported file formats Dependencies Python versions + ======================== ======================= ================= ================== + `pyexcel-xlsxw`_ xlsx(write only) `XlsxWriter`_ Python 2 and 3 `pyexcel-odsr`_ read only for ods, fods lxml same as above `pyexcel-htmlr`_ html(read only) lxml,html5lib same as above ======================== ======================= ================= ================== + .. _pyexcel-io: https://github.com/pyexcel/pyexcel-io .. _pyexcel-xls: https://github.com/pyexcel/pyexcel-xls .. _pyexcel-xlsx: https://github.com/pyexcel/pyexcel-xlsx @@ -127,7 +135,7 @@ get_data(.., library='pyexcel-ods') ============= ======= ======== ======= ======== ======== ======== `pyexcel-io`_ `xls`_ `xlsx`_ `ods`_ `ods3`_ `odsr`_ `xlsxw`_ ============= ======= ======== ======= ======== ======== ======== - 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 + 0.5.1 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 0.4.x 0.4.x 0.4.x 0.4.x 0.4.x 0.4.x 0.4.x 0.3.0+ 0.3.0+ 0.3.0 0.3.0+ 0.3.0+ 0.3.0 0.3.0 0.2.2+ 0.2.2+ 0.2.2+ 0.2.1+ 0.2.1+ 0.0.1 diff --git a/setup.py b/setup.py index 9b89b9f..7939c45 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,4 @@ +import codecs try: from setuptools import setup, find_packages except ImportError: @@ -20,7 +21,7 @@ DESCRIPTION = ( ) URL = 'https://github.com/pyexcel/pyexcel-io' DOWNLOAD_URL = '%s/archive/0.5.1.tar.gz' % URL -FILES = ['README.rst', 'CHANGELOG.rst'] +FILES = ['README.rst', 'CHANGELOG.rst'] KEYWORDS = [ 'API', 'tsv', @@ -74,7 +75,7 @@ def read_files(*files): def read(afile): """Read a file into setup""" - with open(afile, 'r') as opened_file: + with codecs.open(afile, 'r', 'utf-8') as opened_file: content = filter_out_test_code(opened_file) content = "".join(list(content)) return content