Skip to content

Commit e9888e5

Browse files
chfwchfw
committed
🤝 sync with master branch
2 parents 8bf2c96 + 2b8409b commit e9888e5

17 files changed

+417
-96
lines changed

Diff for: ‎.moban.d/README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{%extends 'README.rst.jj2' %}
22

33
{%block description%}
4-
**pyexcel-xlsx** is a tiny wrapper library to read, manipulate and write data in xlsx and xlsm fromat using openpyxl. You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`__.
4+
**{{name}}** is a tiny wrapper library to read, manipulate and write data in xlsx and xlsm format using `read_only` mode reader, `write_only` mode writer from openpyxl. You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`__.
55

66
Please note:
77

88
1. `auto_detect_int` flag will not take effect because openpyxl detect integer in python 3 by default.
9-
2. `skip_hidden_row_and_column` will slow down the read operation.
9+
2. `skip_hidden_row_and_column` will get a penalty where `read_only` mode cannot be used.
1010

1111

1212
{%endblock%}

Diff for: ‎.moban.d/travis.yml

-17
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11
{% extends "travis.yml.jj2" %}
22

3-
{%block extra_matrix %}
4-
matrix:
5-
include:
6-
- python: 2.7
7-
dist: trusty
8-
sudo: required
9-
virtualenv:
10-
system_site_packages: true
11-
addons:
12-
apt:
13-
sources:
14-
- debian-sid # openpyxl 2.3.0
15-
packages:
16-
- python-openpyxl
17-
18-
{%endblock%}
19-
203
{%block custom_install %} - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
214
- pip install --upgrade pip>8 setuptools>21
225
{%endblock%}

Diff for: ‎.moban.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ configuration:
99
- "pyexcel-mobans:templates"
1010
- "pypi-mobans:templates"
1111
- ".moban.d"
12-
configuration: pyexcel_xlsx.yaml
12+
configuration: pyexcel-xlsx.yml
1313
targets:
1414
- Pipfile: Pipfile.jj2
1515
- README.rst: README.rst
@@ -28,3 +28,6 @@ targets:
2828
- "tests/test_stringio.py": "tests/test_stringio.py.jj2"
2929
- "tests/test_writer.py": "tests/test_writer.py.jj2"
3030
- "tests/base.py": "tests/base.py"
31+
- output: CHANGELOG.rst
32+
configuration: changelog.yml
33+
template: CHANGELOG.rst.jj2

Diff for: ‎.travis.yml

-14
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,6 @@ python:
99
- 3.5
1010
- 3.4
1111
- 2.7
12-
matrix:
13-
include:
14-
- python: 2.7
15-
dist: trusty
16-
sudo: required
17-
virtualenv:
18-
system_site_packages: true
19-
addons:
20-
apt:
21-
sources:
22-
- debian-sid # openpyxl 2.3.0
23-
packages:
24-
- python-openpyxl
25-
2612
before_install:
2713
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
2814
- pip install --upgrade pip>8 setuptools>21

Diff for: ‎CHANGELOG.rst

+71-34
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,73 @@
11
Change log
22
================================================================================
33

4+
0.5.6 - 26.03.2018
5+
--------------------------------------------------------------------------------
6+
7+
Added
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `#24 <https://github.com/pyexcel/pyexcel-xlsx/issues/24>`_, remove deprecated
11+
warning from merged_cell_ranges and get_sheet_by_name
12+
13+
0.5.5 - 18.12.2017
14+
--------------------------------------------------------------------------------
15+
16+
Added
17+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18+
19+
#. `#22 <https://github.com/pyexcel/pyexcel-xlsx/issues/22>`_, to detect merged
20+
cell in xlsx - fast tracked patreon request.
21+
22+
0.5.4 - 2.11.2017
23+
--------------------------------------------------------------------------------
24+
25+
Updated
26+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
27+
28+
#. Align the behavior of skip_hidden_row_and_column. Default it to True.
29+
30+
0.5.3 - 2.11.2017
31+
--------------------------------------------------------------------------------
32+
33+
Added
34+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
35+
36+
#. `#20 <https://github.com/pyexcel/pyexcel-xlsx/issues/20>`_, skip hidden rows
37+
and columns under 'skip_hidden_row_and_column' flag.
438

539
0.5.2 - 23.10.2017
640
--------------------------------------------------------------------------------
741

842
updated
9-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
10-
#. pyexcel `#105 <https://github.com/pyexcel/pyexcel/issues/105>`_, remove gease
11-
from setup_requires, introduced by 0.5.1.
43+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44+
45+
#. pyexcel `pyexcel#105 <https://github.com/pyexcel/pyexcel/issues/105>`_,
46+
remove gease from setup_requires, introduced by 0.5.1.
1247
#. remove python2.6 test support
1348
#. update its dependecy on pyexcel-io to 0.5.3
1449

1550
0.5.1 - 20.10.2017
1651
--------------------------------------------------------------------------------
1752

1853
added
19-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
54+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2055

21-
#. `#103 <https://github.com/pyexcel/pyexcel/issues/103>`_, include LICENSE file
22-
in MANIFEST.in, meaning LICENSE file will appear in the released tar ball.
56+
#. `pyexcel#103 <https://github.com/pyexcel/pyexcel/issues/103>`_, include
57+
LICENSE file in MANIFEST.in, meaning LICENSE file will appear in the released
58+
tar ball.
2359

2460
0.5.0 - 30.08.2017
2561
--------------------------------------------------------------------------------
2662

2763
Updated
28-
********************************************************************************
64+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2965

3066
#. put dependency on pyexcel-io 0.5.0, which uses cStringIO instead of StringIO.
3167
Hence, there will be performance boost in handling files in memory.
3268

3369
Removed
34-
********************************************************************************
70+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3571

3672
#. `#18 <https://github.com/pyexcel/pyexcel-xlsx/issues/18>`_, is handled in
3773
pyexcel-io
@@ -40,7 +76,7 @@ Removed
4076
--------------------------------------------------------------------------------
4177

4278
Updated
43-
********************************************************************************
79+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4480

4581
#. `#18 <https://github.com/pyexcel/pyexcel-xlsx/issues/18>`_, handle unseekable
4682
stream given by http response
@@ -49,26 +85,25 @@ Updated
4985
--------------------------------------------------------------------------------
5086

5187
Removed
52-
********************************************************************************
88+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5389

5490
#. Removed useless code
5591

5692
0.4.0 - 19.06.2017
5793
--------------------------------------------------------------------------------
5894

5995
Updated
60-
********************************************************************************
96+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6197

62-
#. `#14 <https://github.com/pyexcel/pyexcel-xlsx/issues/14>`_, close file
63-
handle
64-
#. pyexcel-io plugin interface now updated to use
65-
`lml <https://github.com/chfw/lml>`_.
98+
#. `#14 <https://github.com/pyexcel/pyexcel-xlsx/issues/14>`_, close file handle
99+
#. pyexcel-io plugin interface now updated to use `lml
100+
<https://github.com/chfw/lml>`_.
66101

67102
0.3.0 - 22.12.2016
68103
--------------------------------------------------------------------------------
69104

70105
Updated
71-
********************************************************************************
106+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
72107

73108
#. Code refactoring with pyexcel-io v 0.3.0
74109
#. `#13 <https://github.com/pyexcel/pyexcel-xlsx/issues/13>`_, turn read_only
@@ -78,55 +113,57 @@ Updated
78113
--------------------------------------------------------------------------------
79114

80115
Updated
81-
********************************************************************************
116+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
82117

83118
#. `#12 <https://github.com/pyexcel/pyexcel-xlsx/issues/12>`_, remove
84-
UserWarning: Using a coordinate with ws.cell is deprecated.
85-
Use ws[coordinate]
86-
119+
UserWarning: Using a coordinate with ws.cell is deprecated. Use
120+
ws[coordinate]
87121

88122
0.2.2 - 31.08.2016
89123
--------------------------------------------------------------------------------
90124

91125
Added
92-
********************************************************************************
93-
94-
#. support pagination. two pairs: start_row, row_limit and start_column, column_limit
95-
help you deal with large files.
126+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
96127

128+
#. support pagination. two pairs: start_row, row_limit and start_column,
129+
column_limit help you deal with large files.
97130

98131
0.2.1 - 12.07.2016
99132
--------------------------------------------------------------------------------
100133

101134
Added
102-
********************************************************************************
103-
104-
#. `#8 <https://github.com/pyexcel/pyexcel-xlsx/issues/8>`__, `skip_hidden_sheets` is added. By default, hidden sheets are skipped when reading all sheets. Reading sheet by name or by index are not affected.
135+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
105136

137+
#. `#8 <https://github.com/pyexcel/pyexcel-xlsx/issues/8>`__,
138+
`skip_hidden_sheets` is added. By default, hidden sheets are skipped when
139+
reading all sheets. Reading sheet by name or by index are not affected.
106140

107141
0.2.0 - 01.06.2016
108142
--------------------------------------------------------------------------------
109143

110144
Added
111-
********************************************************************************
145+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
112146

113-
#. 'library=pyexcel-xlsx' was added to inform pyexcel to use it instead of other libraries, in the situation where there are more than one plugin for a file type, e.g. xlsm
147+
#. 'library=pyexcel-xlsx' was added to inform pyexcel to use it instead of other
148+
libraries, in the situation where there are more than one plugin for a file
149+
type, e.g. xlsm
114150

115151
Updated
116-
********************************************************************************
152+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
117153

118154
#. support the auto-import feature of pyexcel-io 0.2.0
119155

120-
121156
0.1.0 - 17.01.2016
122157
--------------------------------------------------------------------------------
123158

124159
Added
125-
********************************************************************************
160+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
126161

127-
#. Passing "streaming=True" to get_data, you will get the two dimensional array as a generator
162+
#. Passing "streaming=True" to get_data, you will get the two dimensional array
163+
as a generator
128164
#. Passing "data=your_generator" to save_data is acceptable too.
129165

130166
Updated
131-
********************************************************************************
167+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
168+
132169
#. compatibility with pyexcel-io 0.1.0

Diff for: ‎Pipfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = 'pypi'
77
python_version= '3.6'
88

99
[packages]
10-
openpyxl>=2.4.4,<2.6.0
10+
openpyxl>=2.5.0,<2.6.0
1111
pyexcel-io>=0.5.3
1212

1313
[dev-packages]

Diff for: ‎README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ pyexcel-xlsx - Let you focus on data, instead of xlsx format
2020
.. image:: https://readthedocs.org/projects/pyexcel-xlsx/badge/?version=latest
2121
:target: http://pyexcel-xlsx.readthedocs.org/en/latest/
2222

23-
**pyexcel-xlsx** is a tiny wrapper library to read, manipulate and write data in xlsx and xlsm fromat using openpyxl. You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`__.
23+
**pyexcel-xlsx** is a tiny wrapper library to read, manipulate and write data in xlsx and xlsm format using `read_only` mode reader, `write_only` mode writer from openpyxl. You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`__.
2424

2525
Please note:
2626

2727
1. `auto_detect_int` flag will not take effect because openpyxl detect integer in python 3 by default.
28-
2. `skip_hidden_row_and_column` will slow down the read operation.
28+
2. `skip_hidden_row_and_column` will get a penalty where `read_only` mode cannot be used.
2929

3030

3131

0 commit comments

Comments
 (0)