Skip to content

Commit c09c716

Browse files
committed
adopt pyexcel-webio 0.1.2
1 parent a269781 commit c09c716

File tree

6 files changed

+53
-32
lines changed

6 files changed

+53
-32
lines changed

.moban.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ configuration:
22
configuration_dir: "commons/config"
33
template_dir:
44
- "commons/templates"
5+
- "setupmobans/templates"
56
- ".moban.d"
67
configuration: pyramid_excel.yaml
78
targets:
@@ -11,9 +12,8 @@ targets:
1112
- .travis.yml: travis.yml
1213
- requirements.txt: requirements.txt
1314
- "tests/requirements.txt": "tests/requirements.txt"
14-
- LICENSE: LICENSE.jj2
1515
- MANIFEST.in: MANIFEST.in.jj2
1616
- "docs/source/index.rst": "docs/source/index.rst.jj2"
17-
- test.sh: test.sh.jj2
18-
- test.bat: test.sh.jj2
17+
- test.sh: test.script.jj2
18+
- test.bat: test.script.jj2
1919

README.rst

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,37 @@ pyramid-excel - Let you focus on data, instead of file formats
88
.. image:: https://api.travis-ci.org/pyexcel/pyramid-excel.svg?branch=master
99
:target: http://travis-ci.org/pyexcel/pyramid-excel
1010

11-
.. image:: https://codecov.io/github/pyexcel/pyramid-excel/coverage.png
12-
:target: https://codecov.io/github/pyexcel/pyramid-excel
11+
.. image:: https://codecov.io/gh/pyexcel/pyramid-excel/branch/master/graph/badge.svg
12+
:target: https://codecov.io/gh/pyexcel/pyramid-excel
1313

1414
.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
1515
:target: https://gitter.im/pyexcel/Lobby
1616

1717
.. image:: https://readthedocs.org/projects/pyramid-excel/badge/?version=latest
1818
:target: http://pyramid-excel.readthedocs.org/en/latest/
1919

20+
Support the project
21+
================================================================================
22+
23+
If your company has embedded pyexcel and its components into a revenue generating
24+
product, please `support me on patreon <https://www.patreon.com/bePatron?u=5537627>`_ to
25+
maintain the project and develop it further.
26+
27+
If you are an individual, you are welcome to support me too on patreon and for however long
28+
you feel like to. As a patreon, you will receive
29+
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
30+
31+
With your financial support, I will be able to invest
32+
a little bit more time in coding, documentation and writing interesting posts.
33+
34+
2035
Known constraints
2136
==================
2237

2338
Fonts, colors and charts are not supported.
2439

40+
Introduction
41+
================================================================================
2542
Here is a typical conversation between the developer and the user::
2643

2744
User: "I have uploaded an excel file"
@@ -85,6 +102,9 @@ The highlighted features are:
85102
`pyexcel-handsontable`_ handsontable in html `handsontable`_ same as above
86103
`pyexcel-pygal`_ svg chart `pygal`_ 2.7, 3.3, 3.4, 3.5
87104
3.6, pypy
105+
`pyexcel-sortable`_ sortable table in html `csvtotable`_ same as above
106+
`pyexcel-gantt`_ gantt chart in html `frappe-gantt`_ except pypy, same
107+
as above
88108
======================== ======================= =============== ==================
89109

90110
.. _pyexcel-io: https://github.com/pyexcel/pyexcel-io
@@ -110,7 +130,10 @@ The highlighted features are:
110130
.. _pygal: https://github.com/Kozea/pygal
111131
.. _pyexcel-matplotlib: https://github.com/pyexcel/pyexcel-matplotlib
112132
.. _matplotlib: https://matplotlib.org
113-
133+
.. _pyexcel-sortable: https://github.com/pyexcel/pyexcel-sortable
134+
.. _csvtotable: https://github.com/vividvilla/csvtotable
135+
.. _pyexcel-gantt: https://github.com/pyexcel/pyexcel-gantt
136+
.. _frappe-gantt: https://github.com/frappe/gantt
114137

115138
In order to manage the list of plugins installed, you need to use pip to add or remove
116139
a plugin. When you use virtualenv, you can have different plugins per virtual
@@ -190,21 +213,6 @@ adding it to the pyramid.includes list::
190213

191214

192215

193-
Support the project
194-
================================================================================
195-
196-
If your company has embedded pyexcel and its components into a revenue generating
197-
product, please `support me on patreon <https://www.patreon.com/bePatron?u=5537627>`_ to
198-
maintain the project and develop it further.
199-
200-
If you are an individual, you are welcome to support me too on patreon and for however long
201-
you feel like to. As a patreon, you will receive
202-
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
203-
204-
With your financial support, I will be able to invest
205-
a little bit more time in coding, documentation and writing interesting posts.
206-
207-
208216
Development guide
209217
================================================================================
210218

@@ -277,6 +285,7 @@ Acceptance criteria
277285

278286

279287

288+
280289
License
281290
================================================================================
282291

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
]
1313

1414
intersphinx_mapping = {
15-
'pyexcel': ('http://pyexcel.readthedocs.org/en/latest/', None),
15+
'pyexcel': ('http://pyexcel.readthedocs.io/en/latest/', None),
1616
}
1717
spelling_word_list_filename = 'spelling_wordlist.txt'
1818
templates_path = ['_templates']

docs/source/index.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ The highlighted features are:
7676
`pyexcel-handsontable`_ handsontable in html `handsontable`_ same as above
7777
`pyexcel-pygal`_ svg chart `pygal`_ 2.7, 3.3, 3.4, 3.5
7878
3.6, pypy
79+
`pyexcel-sortable`_ sortable table in html `csvtotable`_ same as above
80+
`pyexcel-gantt`_ gantt chart in html `frappe-gantt`_ except pypy, same
81+
as above
7982
======================== ======================= =============== ==================
8083

8184
.. _pyexcel-io: https://github.com/pyexcel/pyexcel-io
@@ -101,7 +104,10 @@ The highlighted features are:
101104
.. _pygal: https://github.com/Kozea/pygal
102105
.. _pyexcel-matplotlib: https://github.com/pyexcel/pyexcel-matplotlib
103106
.. _matplotlib: https://matplotlib.org
104-
107+
.. _pyexcel-sortable: https://github.com/pyexcel/pyexcel-sortable
108+
.. _csvtotable: https://github.com/vividvilla/csvtotable
109+
.. _pyexcel-gantt: https://github.com/pyexcel/pyexcel-gantt
110+
.. _frappe-gantt: https://github.com/frappe/gantt
105111

106112
In order to manage the list of plugins installed, you need to use pip to add or remove
107113
a plugin. When you use virtualenv, you can have different plugins per virtual
@@ -233,6 +239,8 @@ And you can start the tiny server by this command, assuming you have save it as
233239

234240

235241

242+
243+
236244
Support the project
237245
-----------------------
238246

pyramid_excel/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,8 @@ def _make_response(content, content_type, status, file_name=None):
7272
return response
7373

7474

75-
# set up webio
76-
webio.ExcelResponse = _make_response
77-
78-
7975
def includeme(config):
8076
""" pyramid_excel extension
8177
"""
78+
webio.init_webio(_make_response)
8279
config.set_request_factory(ExcelRequestFactory)

setup.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@
1818
'e to read and write data in different excel file formats' +
1919
''
2020
)
21+
URL = 'https://github.com/pyexcel/pyramid-excel'
22+
DOWNLOAD_URL = '%s/archive/0.0.4.tar.gz' % URL
23+
FILES = ['README.rst', 'CHANGELOG.rst']
2124
KEYWORDS = [
22-
'excel',
23-
'python',
24-
'pyexcel',
2525
'API',
2626
'Pyramid',
2727
'xls',
2828
'xlsx',
2929
'ods',
3030
'csv'
31+
'python'
3132
]
3233

3334
CLASSIFIERS = [
@@ -104,7 +105,11 @@ def filter_out_test_code(file_handle):
104105
found_test_code = False
105106
yield line
106107
else:
107-
yield line
108+
for keyword in ['|version|', '|today|']:
109+
if keyword in line:
110+
break
111+
else:
112+
yield line
108113

109114

110115
if __name__ == '__main__':
@@ -114,7 +119,9 @@ def filter_out_test_code(file_handle):
114119
version=VERSION,
115120
author_email=EMAIL,
116121
description=DESCRIPTION,
117-
long_description=read_files('README.rst', 'CHANGELOG.rst'),
122+
url=URL,
123+
download_url=DOWNLOAD_URL,
124+
long_description=read_files(*FILES),
118125
license=LICENSE,
119126
keywords=KEYWORDS,
120127
extras_require=EXTRAS_REQUIRE,

0 commit comments

Comments
 (0)