Skip to content

Commit 29a7ffc

Browse files
committed
🤝 sync with latest pyexcel-commons
1 parent 230b628 commit 29a7ffc

14 files changed

+60
-11
lines changed

.moban.yml

+1
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ targets:
2424
- output: CHANGELOG.rst
2525
configuration: changelog.yml
2626
template: CHANGELOG.rst.jj2
27+
- lint.sh: lint.script.jj2

.travis.yml

+14
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,20 @@ python:
1111
- 3.6
1212
- 3.5
1313
- 2.7
14+
15+
stages:
16+
- test
17+
- lint
18+
jobs:
19+
include:
20+
- stage: lint
21+
python: 3.6
22+
script: make lint
23+
24+
stage: test
25+
26+
script: make test
27+
1428
before_install:
1529
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
1630
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then

CHANGELOG.rst

+9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Change log
22
================================================================================
33

4+
0.5.15 - 16.03.2019
5+
--------------------------------------------------------------------------------
6+
7+
updated
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `pyexcel-ods#33 <https://github.com/pyexcel/pyexcel-ods/issues/33>`_: fix
11+
integer comparision error on i586
12+
413
0.5.14 - 21.02.2019
514
--------------------------------------------------------------------------------
615

Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ test:
66
document:
77
sphinx-autogen -o docs/source/generated/ docs/source/*.rst
88
sphinx-build -b html docs/source/ docs/build/
9+
10+
lint:
11+
bash lint.sh
12+

README.rst

+7
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,11 @@ sqlalchemy supported databases. Its supported file formats are extended to cover
7878
======================== ======================= ================= ==================
7979
`pyexcel-xlsxw`_ xlsx(write only) `XlsxWriter`_ Python 2 and 3
8080
`pyexcel-xlsxr`_ xlsx(read only) lxml same as above
81+
`pyexcel-xlsbr`_ xlsx(read only) pyxlsb same as above
8182
`pyexcel-odsr`_ read only for ods, fods lxml same as above
83+
`pyexcel-odsw`_ write only for ods loxun same as above
8284
`pyexcel-htmlr`_ html(read only) lxml,html5lib same as above
85+
`pyexcel-pdfr`_ pdf(read only) pdftables Python 2 only.
8386
======================== ======================= ================= ==================
8487

8588

@@ -89,8 +92,12 @@ sqlalchemy supported databases. Its supported file formats are extended to cover
8992
.. _pyexcel-ods: https://github.com/pyexcel/pyexcel-ods
9093
.. _pyexcel-ods3: https://github.com/pyexcel/pyexcel-ods3
9194
.. _pyexcel-odsr: https://github.com/pyexcel/pyexcel-odsr
95+
.. _pyexcel-odsw: https://github.com/pyexcel/pyexcel-odsw
96+
.. _pyexcel-pdfr: https://github.com/pyexcel/pyexcel-pdfr
97+
9298
.. _pyexcel-xlsxw: https://github.com/pyexcel/pyexcel-xlsxw
9399
.. _pyexcel-xlsxr: https://github.com/pyexcel/pyexcel-xlsxr
100+
.. _pyexcel-xlsbr: https://github.com/pyexcel/pyexcel-xlsbr
94101
.. _pyexcel-htmlr: https://github.com/pyexcel/pyexcel-htmlr
95102

96103
.. _xlrd: https://github.com/python-excel/xlrd

changelog.yml

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: pyexcel-io
22
organisation: pyexcel
33
releases:
4+
- changes:
5+
- action: updated
6+
details:
7+
- '`pyexcel-ods#33`: fix integer comparision error on i586'
8+
version: 0.5.15
9+
date: 16.03.2019
410
- changes:
511
- action: updated
612
details:

docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
copyright = 'copyright 2015-2019 Onni Software Ltd.'
2727
author = 'Onni Software Ltd.'
2828
# The short X.Y version
29-
version = '0.5.14'
29+
version = '0.5.15'
3030
# The full version, including alpha/beta/rc tags
31-
release = '0.5.14'
31+
release = '0.5.15'
3232

3333
# -- General configuration ---------------------------------------------------
3434

docs/source/index.rst

+7
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,11 @@ For individual excel file formats, please install them as you wish:
8585
======================== ======================= ================= ==================
8686
`pyexcel-xlsxw`_ xlsx(write only) `XlsxWriter`_ Python 2 and 3
8787
`pyexcel-xlsxr`_ xlsx(read only) lxml same as above
88+
`pyexcel-xlsbr`_ xlsx(read only) pyxlsb same as above
8889
`pyexcel-odsr`_ read only for ods, fods lxml same as above
90+
`pyexcel-odsw`_ write only for ods loxun same as above
8991
`pyexcel-htmlr`_ html(read only) lxml,html5lib same as above
92+
`pyexcel-pdfr`_ pdf(read only) pdftables Python 2 only.
9093
======================== ======================= ================= ==================
9194

9295

@@ -96,8 +99,12 @@ For individual excel file formats, please install them as you wish:
9699
.. _pyexcel-ods: https://github.com/pyexcel/pyexcel-ods
97100
.. _pyexcel-ods3: https://github.com/pyexcel/pyexcel-ods3
98101
.. _pyexcel-odsr: https://github.com/pyexcel/pyexcel-odsr
102+
.. _pyexcel-odsw: https://github.com/pyexcel/pyexcel-odsw
103+
.. _pyexcel-pdfr: https://github.com/pyexcel/pyexcel-pdfr
104+
99105
.. _pyexcel-xlsxw: https://github.com/pyexcel/pyexcel-xlsxw
100106
.. _pyexcel-xlsxr: https://github.com/pyexcel/pyexcel-xlsxr
107+
.. _pyexcel-xlsbr: https://github.com/pyexcel/pyexcel-xlsbr
101108
.. _pyexcel-htmlr: https://github.com/pyexcel/pyexcel-htmlr
102109

103110
.. _xlrd: https://github.com/python-excel/xlrd

lint.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long

pyexcel-io.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ overrides: "pyexcel.yaml"
22
project: "pyexcel-io"
33
name: pyexcel-io
44
nick_name: io
5-
version: 0.5.14
6-
current_version: 0.5.14
5+
version: 0.5.15
6+
current_version: 0.5.15
77
copyright_year: 2015-2019
8-
release: 0.5.14
8+
release: 0.5.15
99
dependencies:
1010
- ordereddict;python_version<"2.7"
1111
- lml>=0.0.4

setup.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929

3030
NAME = 'pyexcel-io'
3131
AUTHOR = 'C.W.'
32-
VERSION = '0.5.14'
32+
VERSION = '0.5.15'
3333
EMAIL = 'wangc_2011@hotmail.com'
3434
LICENSE = 'New BSD'
3535
DESCRIPTION = (
3636
'A python library to read and write structured data in csv, zipped csv' +
3737
'format and to/from databases'
3838
)
3939
URL = 'https://github.com/pyexcel/pyexcel-io'
40-
DOWNLOAD_URL = '%s/archive/0.5.14.tar.gz' % URL
40+
DOWNLOAD_URL = '%s/archive/0.5.15.tar.gz' % URL
4141
FILES = ['README.rst', 'CHANGELOG.rst']
4242
KEYWORDS = [
4343
'python',
@@ -81,8 +81,8 @@
8181
# You do not need to read beyond this line
8282
PUBLISH_COMMAND = '{0} setup.py sdist bdist_wheel upload -r pypi'.format(
8383
sys.executable)
84-
GS_COMMAND = ('gs pyexcel-io v0.5.14 ' +
85-
"Find 0.5.14 in changelog for more details")
84+
GS_COMMAND = ('gs pyexcel-io v0.5.15 ' +
85+
"Find 0.5.15 in changelog for more details")
8686
NO_GS_MESSAGE = ('Automatic github release is disabled. ' +
8787
'Please install gease to enable it.')
8888
UPLOAD_FAILED_MSG = (

test.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pip freeze
2-
nosetests --with-coverage --cover-package pyexcel_io --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_io && flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long
2+
nosetests --with-coverage --cover-package pyexcel_io --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_io

test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pip freeze
2-
nosetests --with-coverage --cover-package pyexcel_io --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_io && flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long
2+
nosetests --with-coverage --cover-package pyexcel_io --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_io

tests/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)