Skip to content

Commit e6444b8

Browse files
chfwchfw
committed
🤝 merge with master
2 parents e0db184 + 935c8a0 commit e6444b8

File tree

18 files changed

+137
-21
lines changed

18 files changed

+137
-21
lines changed

‎.moban.d/docs/source/index.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ get_data(.., library='pyexcel-ods')
5757
============= ======= ======== ======= ======== ======== ========
5858
`pyexcel-io`_ `xls`_ `xlsx`_ `ods`_ `ods3`_ `odsr`_ `xlsxw`_
5959
============= ======= ======== ======= ======== ======== ========
60-
0.5.1 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0 0.5.0
60+
0.5.10+ 0.5.0+ 0.5.0+ 0.5.4 0.5.3 0.5.0+ 0.5.0+
61+
0.5.1+ 0.5.0+ 0.5.0+ 0.5.0+ 0.5.0+ 0.5.0+ 0.5.0+
6162
0.4.x 0.4.x 0.4.x 0.4.x 0.4.x 0.4.x 0.4.x
6263
0.3.0+ 0.3.0+ 0.3.0 0.3.0+ 0.3.0+ 0.3.0 0.3.0
6364
0.2.2+ 0.2.2+ 0.2.2+ 0.2.1+ 0.2.1+ 0.0.1

‎.moban.yml

Lines changed: 1 addition & 0 deletions
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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
sudo: false
23
dist: xenial
34
language: python
@@ -11,8 +12,34 @@ python:
1112
- 3.6
1213
- 3.5
1314
- 2.7
15+
16+
stages:
17+
- test
18+
- lint
19+
20+
.disable_global: &disable_global
21+
before_install: false
22+
install: true
23+
before_script: false
24+
after_success: false
25+
after_failure: false
26+
27+
.lint: &lint
28+
<<: *disable_global
29+
python: 3.6
30+
stage: lint
31+
install: pip install flake8
32+
script: make lint
33+
34+
jobs:
35+
include:
36+
- *lint
37+
38+
stage: test
39+
40+
script: make test
41+
1442
before_install:
15-
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
1643
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
1744
mv min_requirements.txt requirements.txt ;
1845
fi

‎CHANGELOG.rst

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

4-
0.5.13 - 21.02.2019
4+
0.5.16 - 19.03.2019
5+
--------------------------------------------------------------------------------
6+
7+
updated
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `#67 <https://github.com/pyexcel/pyexcel-io/issues/67>`_: fix conversion
11+
issue for long type on python 2.7 for ods
12+
13+
0.5.15 - 16.03.2019
14+
--------------------------------------------------------------------------------
15+
16+
updated
17+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18+
19+
#. `pyexcel-ods#33 <https://github.com/pyexcel/pyexcel-ods/issues/33>`_: fix
20+
integer comparision error on i586
21+
22+
0.5.14 - 21.02.2019
523
--------------------------------------------------------------------------------
624

725
updated
@@ -10,6 +28,15 @@ updated
1028
#. `#65 <https://github.com/pyexcel/pyexcel-io/issues/65>`_: add
1129
tests/__init__.py because python2.7 setup.py test needs it
1230

31+
0.5.13 - 12.02.2019
32+
--------------------------------------------------------------------------------
33+
34+
updated
35+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
36+
37+
#. `#63 <https://github.com/pyexcel/pyexcel-io/issues/63>`_: Version 0.5.12
38+
prevents xslx and ods plugin from being loaded
39+
1340
0.5.12 - 9.02.2019
1441
--------------------------------------------------------------------------------
1542

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) by Onni Software Ltd. and its contributors
1+
Copyright (c) 2015-2019 by Onni Software Ltd. and its contributors
22
All rights reserved.
33

44
Redistribution and use in source and binary forms of the software as well

‎MANIFEST.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ include README.rst
22
include LICENSE
33
include CHANGELOG.rst
44
recursive-include tests *
5+
<<<<<<< HEAD
6+
=======
7+
recursive-include docs *
8+
>>>>>>> master
59
include docs/source/*
610
include Makefile
711
include test.sh

‎Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ document:
77
sphinx-autogen -o docs/source/generated/ docs/source/*.rst
88
sphinx-build -b html docs/source/ docs/build/
99

10+
<<<<<<< HEAD
1011
format:
1112
isort -y $(find pyexcel_io -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo)
1213
black -l 79 pyexcel_io
1314
black -l 79 tests
15+
=======
16+
lint:
17+
bash lint.sh
18+
19+
>>>>>>> master

‎README.rst

Lines changed: 7 additions & 0 deletions
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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
11
name: pyexcel-io
22
organisation: pyexcel
33
releases:
4+
- changes:
5+
- action: updated
6+
details:
7+
- '`#67`: fix conversion issue for long type on python 2.7 for ods'
8+
version: 0.5.16
9+
date: 19.03.2019
10+
- changes:
11+
- action: updated
12+
details:
13+
- '`pyexcel-ods#33`: fix integer comparision error on i586'
14+
version: 0.5.15
15+
date: 16.03.2019
416
- changes:
517
- action: updated
618
details:
719
- '`#65`: add tests/__init__.py because python2.7 setup.py test needs it'
8-
version: 0.5.13
20+
version: 0.5.14
921
date: 21.02.2019
22+
- changes:
23+
- action: updated
24+
details:
25+
- '`#63`: Version 0.5.12 prevents xslx and ods plugin from being loaded'
26+
version: 0.5.13
27+
date: 12.02.2019
1028
- changes:
1129
- action: updated
1230
details:

‎docs/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
copyright = 'copyright 2015-2019 Onni Software Ltd.'
2121
author = 'C.W.'
2222
# The short X.Y version
23-
version = '0.5.13'
23+
version = '0.5.16'
2424
# The full version, including alpha/beta/rc tags
25-
release = '0.5.13'
25+
release = '0.5.16'
2626

2727
# -- General configuration ---------------------------------------------------
2828

@@ -45,7 +45,7 @@
4545
#
4646
# This is also used if you do content translation via gettext catalogs.
4747
# Usually you set "language" from the command line for these cases.
48-
language = 'en'
48+
language = 'Python'
4949

5050
# List of patterns, relative to source directory, that match files and
5151
# directories to ignore when looking for source files.

0 commit comments

Comments
 (0)