Skip to content

Commit 3fc0533

Browse files
committed
🤝 merge with master branch
2 parents a8f3eec + 571e882 commit 3fc0533

26 files changed

+557
-219
lines changed

.moban.d/setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55

66
{%block compat_block%}
77
{%endblock%}
8-

.moban.d/tests/requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{% extends 'tests/requirements.txt.jj2' %}
22
{%block extras %}
3+
moban
4+
black;python_version>="3.6"
5+
isort;python_version>="3.6"
36
psutil
47
pyexcel
58
pyexcel-xls

.moban.d/tests/test_formatters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{% extends 'tests/test_formatters.py.jj2' %}
22

33
{% block test_date_format %}
4-
{% endblock %}
4+
{% endblock %}

.moban.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
requires:
2+
- type: git
3+
url: https://github.com/moremoban/pypi-mobans
4+
submodule: true
5+
- https://github.com/pyexcel/pyexcel-mobans
16
configuration:
2-
configuration_dir: "commons/config"
7+
configuration_dir: "pyexcel-mobans:config"
38
template_dir:
4-
- "commons/templates"
5-
- "setupmobans/templates"
9+
- "pyexcel-mobans:templates"
10+
- "pypi-mobans:templates"
611
- ".moban.d"
712
configuration: pyexcel-ods.yml
813
targets:
@@ -22,3 +27,6 @@ targets:
2227
- "tests/test_stringio.py": "tests/test_stringio.py.jj2"
2328
- "tests/test_writer.py": "tests/test_writer.py.jj2"
2429
- "tests/base.py": "tests/base.py.jj2"
30+
- output: CHANGELOG.rst
31+
configuration: changelog.yml
32+
template: CHANGELOG.rst.jj2

CHANGELOG.rst

Lines changed: 108 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,135 @@
11
Change log
22
================================================================================
33

4+
0.5.4 - 27.11.2018
5+
--------------------------------------------------------------------------------
6+
7+
added
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `#30 <https://github.com/pyexcel/pyexcel-ods/issues/30>`_, long type will not
11+
be written in ods. please use string type. And if the integer is equal or
12+
greater than 10 to the power of 16, it will not be written either in ods. In
13+
both situation, IntegerPrecisionLossError will be raised.
14+
15+
0.5.3 - unreleased
16+
--------------------------------------------------------------------------------
17+
18+
added
19+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
20+
21+
#. `#24 <https://github.com/pyexcel/pyexcel-ods/issues/24>`_, ignore
22+
comments(<office:comment>) in cell
23+
#. `#27 <https://github.com/pyexcel/pyexcel-ods/issues/27>`_, exception raised
24+
when currency type is missing
25+
#. fix odfpy version on 1.3.5.
26+
27+
0.5.2 - 23.10.2017
28+
--------------------------------------------------------------------------------
29+
30+
updated
31+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
32+
33+
#. pyexcel `pyexcel#105 <https://github.com/pyexcel/pyexcel/issues/105>`_,
34+
remove gease from setup_requires, introduced by 0.5.1.
35+
#. remove python2.6 test support
36+
37+
0.5.1 - 20.10.2017
38+
--------------------------------------------------------------------------------
39+
40+
added
41+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
42+
43+
#. `pyexcel#103 <https://github.com/pyexcel/pyexcel/issues/103>`_, include
44+
LICENSE file in MANIFEST.in, meaning LICENSE file will appear in the released
45+
tar ball.
46+
47+
0.5.0 - 30.08.2017
48+
--------------------------------------------------------------------------------
49+
50+
Updated
51+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
52+
53+
#. put dependency on pyexcel-io 0.5.0, which uses cStringIO instead of StringIO.
54+
Hence, there will be performance boost in handling files in memory.
55+
56+
Relocated
57+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
58+
59+
#. All ods type conversion code lives in pyexcel_io.service module
60+
461
0.4.1 - 25.08.2017
562
--------------------------------------------------------------------------------
663

764
Updated
8-
********************************************************************************
65+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
966

10-
#. `#23 <https://github.com/pyexcel/pyexcel-ods/issues/23>`_, handle unseekable
11-
stream given by http response
67+
#. `pyexcel#23 <https://github.com/pyexcel/pyexcel/issues/23>`_, handle
68+
unseekable stream given by http response
1269
#. PR `#22 <https://github.com/pyexcel/pyexcel-ods/pull/22>`_, hanle white
1370
spaces in a cell.
1471

1572
0.4.0 - 19.06.2017
1673
--------------------------------------------------------------------------------
1774

1875
Updated
19-
********************************************************************************
76+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2077

21-
#. `#14 <https://github.com/pyexcel/pyexcel-xlsx/issues/14>`_, close file
78+
#. `pyexcel#14 <https://github.com/pyexcel/pyexcel/issues/14>`_, close file
2279
handle
23-
#. pyexcel-io plugin interface now updated to use
24-
`lml <https://github.com/chfw/lml>`_.
25-
80+
#. pyexcel-io plugin interface now updated to use `lml
81+
<https://github.com/chfw/lml>`_.
2682

2783
0.3.3 - 07.05.2017
2884
--------------------------------------------------------------------------------
2985

3086
Updated
31-
********************************************************************************
87+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3288

33-
#. issue `#19 <https://github.com/pyexcel/pyexcel-odsr/issues/19>`_, not all texts
34-
in a multi-node cell were extracted.
89+
#. issue `pyexcel#19 <https://github.com/pyexcel/pyexcel/issues/19>`_, not all
90+
texts in a multi-node cell were extracted.
3591

3692
0.3.2 - 13.04.2017
3793
--------------------------------------------------------------------------------
3894

3995
Updated
40-
********************************************************************************
96+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4197

42-
#. issue `#17 <https://github.com/pyexcel/pyexcel-ods/issues/17>`_, empty
43-
new line is ignored
44-
#. issue `#6 <https://github.com/pyexcel/pyexcel-ods/issues/6>`_, PT288H00M00S
45-
is valid duration
98+
#. issue `pyexcel#17 <https://github.com/pyexcel/pyexcel/issues/17>`_, empty new
99+
line is ignored
100+
#. issue `pyexcel#6 <https://github.com/pyexcel/pyexcel/issues/6>`_,
101+
PT288H00M00S is valid duration
46102

47103
0.3.1 - 02.02.2017
48104
--------------------------------------------------------------------------------
49105

50106
Added
51-
********************************************************************************
107+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
52108

53109
#. Recognize currency type
54110

55111
0.3.0 - 22.12.2016
56112
--------------------------------------------------------------------------------
57113

58114
Updated
59-
********************************************************************************
115+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
60116

61117
#. Code refactoring with pyexcel-io v 0.3.0
62118

63-
64119
0.2.2 - 24.10.2016
65120
--------------------------------------------------------------------------------
66121

67122
Updated
68-
********************************************************************************
69-
70-
#. issue `#14 <https://github.com/pyexcel/pyexcel-ods/issues/14>`_, index error
71-
when reading a ods file that has non-uniform columns repeated property.
123+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
72124

125+
#. issue `pyexcel#14 <https://github.com/pyexcel/pyexcel/issues/14>`_, index
126+
error when reading a ods file that has non-uniform columns repeated property.
73127

74128
0.2.1 - 31.08.2016
75129
--------------------------------------------------------------------------------
76130

77131
Added
78-
********************************************************************************
132+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
79133

80134
#. support pagination. two pairs: start_row, row_limit and start_column,
81135
column_limit help you deal with large files.
@@ -85,114 +139,116 @@ Added
85139
--------------------------------------------------------------------------------
86140

87141
Added
88-
********************************************************************************
142+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
89143

90144
#. By default, `float` will be converted to `int` where fits. `auto_detect_int`,
91145
a flag to switch off the autoatic conversion from `float` to `int`.
92146
#. 'library=pyexcel-ods' was added so as to inform pyexcel to use it instead of
93147
other libraries, in the situation where multiple plugins were installed.
94148

95-
96149
Updated
97-
********************************************************************************
150+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
98151

99152
#. support the auto-import feature of pyexcel-io 0.2.0
100153

101-
102154
0.1.1 - 30.01.2016
103155
--------------------------------------------------------------------------------
104156

105157
Added
106-
********************************************************************************
158+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
107159

108-
#. 'streaming' is an extra option given to get_data. Only when 'streaming'
109-
is explicitly set to True, the data will be consisted of generators,
110-
hence will break your existing code.
160+
#. 'streaming' is an extra option given to get_data. Only when 'streaming' is
161+
explicitly set to True, the data will be consisted of generators, hence will
162+
break your existing code.
111163
#. uses yield in to_array and returns a generator
112164
#. support multi-line text cell #5
113165
#. feature migration from pyexcel-ods3 pyexcel/pyexcel-ods3#5
114166

115167
Updated
116-
********************************************************************************
117-
#. compatibility with pyexcel-io 0.1.1
168+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
118169

170+
#. compatibility with pyexcel-io 0.1.1
119171

120172
0.0.12 - 10.10.2015
121173
--------------------------------------------------------------------------------
122174

123175
Updated
124-
********************************************************************************
125-
#. Bug fix: excessive trailing columns with empty values
176+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
126177

178+
#. Bug fix: excessive trailing columns with empty values
127179

128180
0.0.11 - 26.09.2015
129181
--------------------------------------------------------------------------------
130182

131183
Updated
132-
********************************************************************************
133-
#. Complete fix for libreoffice datetime field
184+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
134185

186+
#. Complete fix for libreoffice datetime field
135187

136188
0.0.10 - 15.09.2015
137189
--------------------------------------------------------------------------------
138190

139191
Updated
140-
********************************************************************************
141-
#. Bug fix: date field could have datetime from libreoffice
192+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
142193

194+
#. Bug fix: date field could have datetime from libreoffice
143195

144196
0.0.9 - 21.08.2015
145197
--------------------------------------------------------------------------------
146198

147199
Updated
148-
********************************************************************************
149-
#. Bug fix: utf-8 string throw unicode exceptions
200+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
150201

202+
#. Bug fix: utf-8 string throw unicode exceptions
151203

152204
0.0.8 - 28.06.2015
153205
--------------------------------------------------------------------------------
154206

155207
Updated
156-
********************************************************************************
157-
#. Pin dependency odfpy 0.9.6 to avoid buggy odfpy 1.3.0
208+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
158209

210+
#. Pin dependency odfpy 0.9.6 to avoid buggy odfpy 1.3.0
159211

160212
0.0.7 - 28.05.2015
161213
--------------------------------------------------------------------------------
162214

163215
Updated
164-
********************************************************************************
165-
#. Bug fix: "number-columns-repeated" is now respected
216+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
166217

218+
#. Bug fix: "number-columns-repeated" is now respected
167219

168220
0.0.6 - 21.05.2015
169221
--------------------------------------------------------------------------------
170222

171223
Updated
172-
********************************************************************************
224+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
225+
173226
#. get_data and save_data are seen across pyexcel-* extensions. remember them
174227
once and use them across all extensions.
175228

176-
177229
0.0.5 - 22.02.2015
178230
--------------------------------------------------------------------------------
179231

180232
Added
181-
********************************************************************************
233+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
182234

183235
#. Loads only one sheet from a multiple sheet book
184236
#. Use New BSD License
185237

186-
187238
0.0.4 - 14.12.2014
188239
--------------------------------------------------------------------------------
189240

190241
Updated
191-
********************************************************************************
192-
#. IO interface update as pyexcel-io introduced keywords.
242+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
193243

244+
#. IO interface update as pyexcel-io introduced keywords.
245+
#. initial release
194246

195247
0.0.3 - 08.12.2014
196248
--------------------------------------------------------------------------------
197249

250+
Updated
251+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
252+
253+
#. IO interface update as pyexcel-io introduced keywords.
198254
#. initial release

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ all: test
33
test:
44
bash test.sh
55

6+
format:
7+
isort -y $(find pyexcel_ods -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo)
8+
black -l 79 pyexcel_ods
9+
black -l 79 tests

0 commit comments

Comments
 (0)