Skip to content

Commit 2948a85

Browse files
committed
Merge branch 'master' of https://github.com/chfw/pyexcel-webio
2 parents d9f9d30 + 2fd4bc3 commit 2948a85

File tree

4 files changed

+46
-2
lines changed

4 files changed

+46
-2
lines changed

LICENSE

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Copyright (c) 2015 by Onni Software Ltd.
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms of the software as well
5+
as documentation, with or without modification, are permitted provided
6+
that the following conditions are met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
11+
* Redistributions in binary form must reproduce the above
12+
copyright notice, this list of conditions and the following
13+
disclaimer in the documentation and/or other materials provided
14+
with the distribution.
15+
16+
* The names of the contributors may not be used to endorse or
17+
promote products derived from this software without specific
18+
prior written permission.
19+
20+
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
21+
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
22+
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
24+
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
27+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
28+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
29+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30+
SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
31+
DAMAGE.

README.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,12 @@ This small section outlines the steps to adapt **pyexcel-webio** for your favour
8888
make_response_from_book_dict
8989
)
9090

91+
License
92+
==========
93+
94+
New BSD License
95+
9196
Dependencies
9297
============
9398

94-
* pyexcel
99+
* pyexcel >= 0.1.2

pyexcel_webio/__init__.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
"""
2+
pyexcel.ext.webio
3+
~~~~~~~~~~~~~~~~~~~
4+
5+
A generic request and response interface for pyexcel web extensions
6+
7+
:copyright: (c) 2015 by Onni Software Ltd.
8+
:license: New BSD License
9+
"""
110
import pyexcel as pe
211
import sys
312
PY2 = sys.version_info[0] == 2

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
'Topic :: Software Development :: Libraries :: Python Modules',
3535
'Programming Language :: Python',
3636
'License :: OSI Approved :: BSD License',
37-
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
3837
'Intended Audience :: Developers',
3938
'Programming Language :: Python :: 2',
4039
'Programming Language :: Python :: 2.6',

0 commit comments

Comments
 (0)