Skip to content

Commit b32b220

Browse files
committed
prepare for release v0.2.0, fix #22
1 parent a706a89 commit b32b220

File tree

7 files changed

+42
-23
lines changed

7 files changed

+42
-23
lines changed

.moban.d/README.rst

+31-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
================================================================================
2-
{{name}} - Let you focus on data, instead of {{file_type}} format
2+
{{name}} - Let you focus on data, instead of {{file_type}} formats
33
================================================================================
44

55
.. image:: https://api.travis-ci.org/pyexcel/{{name}}.png
@@ -28,37 +28,45 @@ its capbility to present and write data in text fromats mainly through `tabulate
2828
Usage
2929
======
3030

31-
Here is the example usage:
31+
Simple
32+
------------
3233

3334
.. code-block:: python
3435
3536
>>> import pyexcel as pe
36-
>>> import pyexcel.ext.text as text
3737
>>> content = [
3838
... ["Column 1", "Column 2", "Column 3"],
3939
... [1, 2, 3],
4040
... [4, 5, 6],
4141
... [7, 8, 9]
4242
... ]
4343
>>> sheet = pe.Sheet(content)
44-
>>> sheet
44+
>>> print(sheet.simple)
4545
Sheet Name: pyexcel
4646
-------- -------- --------
4747
Column 1 Column 2 Column 3
4848
1 2 3
4949
4 5 6
5050
7 8 9
5151
-------- -------- --------
52+
<BLANKLINE>
5253
>>> sheet.name_columns_by_row(0)
53-
>>> sheet
54+
>>> print(sheet.simple)
5455
Sheet Name: pyexcel
5556
Column 1 Column 2 Column 3
5657
---------- ---------- ----------
5758
1 2 3
5859
4 5 6
5960
7 8 9
60-
>>> text.TABLEFMT = "grid"
61-
>>> sheet
61+
<BLANKLINE>
62+
63+
64+
Grid
65+
-------
66+
67+
.. code-block:: python
68+
69+
>>> print(sheet.grid)
6270
Sheet Name: pyexcel
6371
+------------+------------+------------+
6472
| Column 1 | Column 2 | Column 3 |
@@ -69,6 +77,13 @@ Here is the example usage:
6977
+------------+------------+------------+
7078
| 7 | 8 | 9 |
7179
+------------+------------+------------+
80+
<BLANKLINE>
81+
82+
Mediawiki
83+
-------------
84+
85+
.. code-block:: python
86+
7287
>>> multiple_sheets = {
7388
... 'Sheet 1':
7489
... [
@@ -90,7 +105,6 @@ Here is the example usage:
90105
... ]
91106
... }
92107
>>> book = pe.Book(multiple_sheets)
93-
>>> text.TABLEFMT = "mediawiki"
94108
>>> book.save_as("myfile.mediawiki")
95109
>>> myfile = open("myfile.mediawiki")
96110
>>> print(myfile.read())
@@ -126,10 +140,16 @@ Here is the example usage:
126140
|}
127141
<BLANKLINE>
128142
>>> myfile.close()
143+
144+
Html
145+
----------
146+
147+
.. code-block:: python
148+
129149
>>> book.save_as("myfile.html")
130150
>>> myfile = open("myfile.html")
131151
>>> print(myfile.read())
132-
<html><header><title>myfile.html</title><body>Sheet Name: Sheet 1
152+
Sheet Name: Sheet 1
133153
<table>
134154
<tr><td style="text-align: right;">1</td><td style="text-align: right;">2</td><td style="text-align: right;">3</td></tr>
135155
<tr><td style="text-align: right;">4</td><td style="text-align: right;">5</td><td style="text-align: right;">6</td></tr>
@@ -147,8 +167,7 @@ Here is the example usage:
147167
<tr><td>3.0</td><td>2.0</td><td>1.0</td></tr>
148168
<tr><td>4.0</td><td>3.0</td><td>2.0</td></tr>
149169
</table>
150-
</body></html>
151-
170+
<BLANKLINE>
152171
153172
.. testcode::
154173
:hide:
@@ -157,6 +176,7 @@ Here is the example usage:
157176
>>> import os
158177
>>> os.unlink("myfile.mediawiki")
159178
>>> os.unlink("myfile.html")
179+
160180
{%endblock%}
161181

162182
{%block extras %}

.travis.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
sudo: false
22
language: python
3-
43
notifications:
54
email: false
6-
75
python:
86
- 2.7
97
- 2.6
@@ -12,12 +10,10 @@ python:
1210
- 3.3
1311
- 3.4
1412
- 3.5
15-
before_script:
13+
before_install:
1614
- pip install https://github.com/pyexcel/pyexcel/archive/v0.2.1.zip
1715
- pip install -r tests/requirements.txt
18-
1916
script:
2017
make test
21-
2218
after_success:
2319
codecov

CHANGELOG.rst

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
Change log
22
================================================================================
33

4-
Unreleased
4+
Planned
55
--------------------------------------------------------------------------------
66

77
#. compactibility with pyexcel-io 0.2.0 and pyexcel 0.2.1
88

99

10-
0.1.2 - 03.04.2016
10+
0.2.0 - 23.04.2016
1111
--------------------------------------------------------------------------------
1212

13+
It is a complete re-write of the whole extension.
14+
1315
Added
1416
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1517

1618
#. html support
1719
#. support pyexcel 0.2.0's generator output
1820
#. pypy and pypy3 in test targets
21+
#. support file stream and dot notation, e.g. pyexcel.Sheet.rst will return rst text representation of it.
1922

2023
Updated
2124
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2225

23-
#. `#8 <https://github.com/pyexcel/pyexcel-text/issues/8>`_,
24-
write_header as an option(False) to disable header writing
26+
#. `#8 <https://github.com/pyexcel/pyexcel-text/issues/8>`_, write_header as an option(False) to disable header writing
2527
#. the json output of multiple sheet book will be sorted by its sheet names.
28+
#. No longer, pyexcel-text is pyexcel-io plugin but pyexcel.sources plugin.
2629

2730
0.1.1 - 30.01.2016
2831
--------------------------------------------------------------------------------

README.rst

+1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ Html
176176
>>> os.unlink("myfile.mediawiki")
177177
>>> os.unlink("myfile.html")
178178

179+
179180
Dependencies
180181
============
181182

pyexcel_text.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
overrides: "pyexcel.yaml"
22
name: "pyexcel-text"
33
nick_name: text
4-
version: 0.1.2
4+
version: 0.2.0
55
file_type: text
66
dependencies:
77
- pyexcel>=0.2.0

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
setup(
2323
name='pyexcel-text',
2424
author='C.W.',
25-
version='0.1.2',
25+
version='0.2.0',
2626
author_email='wangc_2011 (at) hotmail.com',
2727
url='https://github.com/pyexcel/pyexcel-text',
2828
description='A plugin to pyexcel and provides the capbility to present and write data in text fromats',

tests/requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
nose
2-
rednose
32
nose-cov
43
codecov
54
coverage

0 commit comments

Comments
 (0)