Skip to content

Commit 5303e72

Browse files
chfwchfw
authored
Merge pull request #6 from pyexcel/dev
release 0.6.0
2 parents be0c5cb + 575fd56 commit 5303e72

25 files changed

+551
-480
lines changed

‎.moban.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
overrides: "git://github.com/pyexcel/pyexcel-mobans!/mobanfile.yaml"
22
configuration:
3-
configuration: pyexcel_odsr.yml
3+
configuration: pyexcel-odsr.yml
44
targets:
55
- README.rst: custom_readme.rst.jj2
6-
- setup.py: custom_setup.py.jj2
76
- .travis.yml: custom_travis.yml.jj2
87
- "tests/requirements.txt": "tests/custom_req.txt.jj2"
9-
- "tests/test_filter.py": "tests/test_filter.py.jj2"
10-
- "tests/test_formatters.py": "tests/test_formatters.py"
11-
- "tests/test_stringio.py": "tests/test_stringio.py.jj2"
128
- "tests/base.py": "tests/base.py"
139
- "pyexcel_odsr/_version.py": "version.py.jj2"
10+
- setup.py: custom_setup.py.jj2

‎.travis.yml

-11
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ python:
1010

1111
stages:
1212
- lint
13-
- moban
1413
- test
1514

1615

@@ -23,16 +22,6 @@ stages:
2322
stage: lint
2423
script: make lint
2524

26-
.moban: &moban
27-
python: 3.6
28-
env:
29-
- MINREQ=0
30-
stage: moban
31-
install: pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
32-
script:
33-
- moban
34-
- git diff --exit-code
35-
3625
jobs:
3726
include:
3827
- *moban

‎CHANGELOG.rst

+99
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,101 @@
11
Change log
22
================================================================================
3+
4+
0.6.0 - 10.10.2020
5+
--------------------------------------------------------------------------------
6+
7+
**Updated**
8+
9+
#. New style xlsx plugins, promoted by pyexcel-io v0.6.2.
10+
11+
0.5.2 - 23.10.2017
12+
--------------------------------------------------------------------------------
13+
14+
**updated**
15+
16+
#. `pyexcel#105 <https://github.com/pyexcel/pyexcel/issues/105>`_, remove gease
17+
from setup_requires, introduced by 0.5.1.
18+
#. remove python2.6 test support
19+
#. update its dependecy on pyexcel-io to 0.5.3
20+
21+
0.5.1 - 20.10.2017
22+
--------------------------------------------------------------------------------
23+
24+
**added**
25+
26+
#. `pyexcel#103 <https://github.com/pyexcel/pyexcel/issues/103>`_, include
27+
LICENSE file in MANIFEST.in, meaning LICENSE file will appear in the released
28+
tar ball.
29+
30+
0.5.0 - 30.08.2017
31+
--------------------------------------------------------------------------------
32+
33+
**Updated**
34+
35+
#. put dependency on pyexcel-io 0.5.0, which uses cStringIO instead of StringIO.
36+
Hence, there will be performance boost in handling files in memory.
37+
38+
**Relocated**
39+
40+
#. All ods type conversion code lives in pyexcel_io.service module
41+
#. `#4 <https://github.com/pyexcel/pyexcel-odsr/issues/4>`_, handle unseekable
42+
stream given by http response.
43+
44+
0.4.3 - 25.08.2017
45+
--------------------------------------------------------------------------------
46+
47+
**Relocated**
48+
49+
#. All ods type conversion code lives in pyexcel_io.service module
50+
#. `#4 <https://github.com/pyexcel/pyexcel-odsr/issues/4>`_, handle unseekable
51+
stream given by http response.
52+
53+
0.4.2 - 20.08.2017
54+
--------------------------------------------------------------------------------
55+
56+
0.4.1 - 26.07.2017
57+
--------------------------------------------------------------------------------
58+
59+
**Updated**
60+
61+
#. PR `#3 <https://github.com/pyexcel/pyexcel-odsr/pull/3>`_, support fods, flat
62+
ods file
63+
64+
0.4.0 - 19.06.2017
65+
--------------------------------------------------------------------------------
66+
67+
**Updated**
68+
69+
#. Updated to use lml interface
70+
71+
0.3.2 - 07.05.2017
72+
--------------------------------------------------------------------------------
73+
74+
**Updated**
75+
76+
#. issue `#2 <https://github.com/pyexcel/pyexcel-odsr/issues/2>`_, not all texts
77+
in a multi-node cell were extracted.
78+
79+
0.3.1 - 13.04.2017
80+
--------------------------------------------------------------------------------
81+
82+
**Updated**
83+
84+
#. issue `#1 <https://github.com/pyexcel/pyexcel-odsr/issues/1>`_, PT288H00M00S
85+
is valid duration
86+
#. initial release. It has all functionalities of pyexcel-ods and pyexcel-ods3.
87+
Specially, it supports partial reading of the ods file. When dealing with big
88+
data file, this capability enables pagination feature to indeed read partial
89+
files.
90+
91+
0.3.0 - 02.02.2017
92+
--------------------------------------------------------------------------------
93+
94+
**Updated**
95+
96+
#. issue `#1 <https://github.com/pyexcel/pyexcel-odsr/issues/1>`_, PT288H00M00S
97+
is valid duration
98+
#. initial release. It has all functionalities of pyexcel-ods and pyexcel-ods3.
99+
Specially, it supports partial reading of the ods file. When dealing with big
100+
data file, this capability enables pagination feature to indeed read partial
101+
files.

‎LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-2019 by Onni Software Ltd. and its contributors
1+
Copyright (c) 2015-2020 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
@@ -13,7 +13,7 @@ that the following conditions are met:
1313
and/or other materials provided with the distribution.
1414

1515
* Neither the name of 'pyexcel-odsr' nor the names of the contributors
16-
may be used to endorse or promote products derived from this software
16+
may not be used to endorse or promote products derived from this software
1717
without specific prior written permission.
1818

1919
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND

‎README.rst

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
2626
:target: https://gitter.im/pyexcel/Lobby
2727

28+
.. image:: https://img.shields.io/static/v1?label=continuous%20templating&message=%E6%A8%A1%E7%89%88%E6%9B%B4%E6%96%B0&color=blue&style=flat-square
29+
:target: https://moban.readthedocs.io/en/latest/#at-scale-continous-templating-for-open-source-projects
30+
31+
.. image:: https://img.shields.io/static/v1?label=coding%20style&message=black&color=black&style=flat-square
32+
:target: https://github.com/psf/black
2833

2934
**pyexcel-odsr** is a specialized ods reader based on tailored ods reader from
3035
`messytables <https://github.com/okfn/messytables>`_.

‎changelog.yml

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: pyexcel-odsr
2+
organisation: pyexcel
3+
releases:
4+
- changes:
5+
- action: Updated
6+
details:
7+
- 'New style xlsx plugins, promoted by pyexcel-io v0.6.2.'
8+
date: 10.10.2020
9+
version: 0.6.0
10+
- changes:
11+
- action: updated
12+
details:
13+
- "`pyexcel#105`, remove gease from setup_requires, introduced by 0.5.1."
14+
- remove python2.6 test support
15+
- update its dependecy on pyexcel-io to 0.5.3
16+
date: 23.10.2017
17+
version: 0.5.2
18+
- changes:
19+
- action: added
20+
details:
21+
- '`pyexcel#103`, include LICENSE file in MANIFEST.in, meaning LICENSE file will
22+
appear in the released tar ball.'
23+
date: 20.10.2017
24+
version: 0.5.1
25+
- changes:
26+
- action: Updated
27+
details:
28+
- put dependency on pyexcel-io 0.5.0, which uses cStringIO instead of StringIO. Hence,
29+
there will be performance boost in handling files in memory.
30+
- action: Relocated
31+
details:
32+
- All ods type conversion code lives in pyexcel_io.service module
33+
- '`#4`, handle unseekable stream given by http response.'
34+
date: 30.08.2017
35+
version: 0.5.0
36+
- changes:
37+
- action: Relocated
38+
details:
39+
- All ods type conversion code lives in pyexcel_io.service module
40+
- '`#4`, handle unseekable stream given by http response.'
41+
date: 25.08.2017
42+
version: 0.4.3
43+
- changes: []
44+
date: 20.08.2017
45+
version: 0.4.2
46+
- changes:
47+
- action: Updated
48+
details:
49+
- PR `PR#3`, support fods, flat ods file
50+
date: 26.07.2017
51+
version: 0.4.1
52+
- changes:
53+
- action: Updated
54+
details:
55+
- Updated to use lml interface
56+
date: 19.06.2017
57+
version: 0.4.0
58+
- changes:
59+
- action: Updated
60+
details:
61+
- issue `#2`, not all texts in a multi-node cell were extracted.
62+
date: 07.05.2017
63+
version: 0.3.2
64+
- changes:
65+
- action: Updated
66+
details:
67+
- issue `#1`, PT288H00M00S is valid duration
68+
- initial release. It has all functionalities of pyexcel-ods and pyexcel-ods3. Specially,
69+
it supports partial reading of the ods file. When dealing with big data file,
70+
this capability enables pagination feature to indeed read partial files.
71+
date: 13.04.2017
72+
version: 0.3.1
73+
- changes:
74+
- action: Updated
75+
details:
76+
- issue `#1`, PT288H00M00S is valid duration
77+
- initial release. It has all functionalities of pyexcel-ods and pyexcel-ods3. Specially,
78+
it supports partial reading of the ods file. When dealing with big data file,
79+
this capability enables pagination feature to indeed read partial files.
80+
date: 02.02.2017
81+
version: 0.3.0

‎pyexcel-odsr.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
overrides: "pyexcel.yaml"
22
name: "pyexcel-odsr"
33
nick_name: odsr
4-
version: 0.5.2
5-
current_version: 0.5.2
6-
release: 0.5.2
4+
version: 0.6.0
5+
current_version: 0.6.0
6+
release: 0.6.0
77
file_type: ods
88
dependencies:
9-
- pyexcel-io>=0.5.3
9+
- pyexcel-io>=0.6.2
1010
- lxml>=3.2
11+
test_dependencies:
12+
- pyexcel
13+
- psutil
14+
- pyexcel-ods>=0.6.0
15+
- pyexcel-xls>=0.6.0
1116
keywords:
1217
- excel
1318
- ods
1419
description: a plugin to pyexcel and provides the capbility to read data in ods formats using tailored messytables.
20+
python_requires: ">=3.6"
21+
min_python_version: "3.6"
22+
moban_command: false

‎pyexcel_odsr/__init__.py

+24-11
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,37 @@
22
pyexcel_odsr
33
~~~~~~~~~~~~~~~~~~~
44
The lower level ods file format handler using messytables
5-
:copyright: (c) 2015-2017 by Onni Software Ltd & its contributors
5+
:copyright: (c) 2015-2020 by Onni Software Ltd & its contributors
66
:license: New BSD License
77
"""
8-
from pyexcel_io.plugins import IOPluginInfoChain
9-
from pyexcel_io.io import get_data as read_data, isstream
10-
from pyexcel_odsr._version import __version__, __author__ # flake8: noqa
8+
from pyexcel_io.io import get_data as read_data
9+
from pyexcel_io.io import isstream
10+
from pyexcel_io.plugins import IOPluginInfoChainV2
1111

12-
__FILE_TYPE__ = 'ods'
13-
__FILE_TYPE_FODS__ = 'fods'
12+
from pyexcel_odsr._version import __author__, __version__ # noqa
1413

15-
IOPluginInfoChain(__name__).add_a_reader(
16-
relative_plugin_class_path='odsr.ODSBook',
14+
__FILE_TYPE__ = "ods"
15+
__FILE_TYPE_FODS__ = "fods"
16+
17+
IOPluginInfoChainV2(__name__).add_a_reader(
18+
relative_plugin_class_path="odsr.ODSBook",
19+
locations=["file", "memory"],
20+
file_types=[__FILE_TYPE__],
21+
stream_type="binary",
22+
).add_a_reader(
23+
relative_plugin_class_path="odsr.FODSBook",
24+
file_types=[__FILE_TYPE_FODS__],
25+
stream_type="binary",
26+
).add_a_reader(
27+
relative_plugin_class_path="odsr.ODSBookInContent",
1728
file_types=[__FILE_TYPE__],
18-
stream_type='binary'
29+
locations=["content"],
30+
stream_type="binary",
1931
).add_a_reader(
20-
relative_plugin_class_path='odsr.FODSBook',
32+
relative_plugin_class_path="odsr.FODSBookInConent",
2133
file_types=[__FILE_TYPE_FODS__],
22-
stream_type='binary'
34+
locations=["content"],
35+
stream_type="binary",
2336
)
2437

2538

‎pyexcel_odsr/_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Auto generated by moban
2-
__version__ = '0.5.2'
2+
__version__ = '0.6.0'
33
__author__ = 'chfw'

0 commit comments

Comments
 (0)