merge

Author: chfw

LICENSE

@@ -0,0 +1,28 @@
+Copyright (c) 2015, Onni Software Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Flask-Excel nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

README.rst

@@ -116,6 +116,11 @@ Here is the example viewing function codes::
         sheet = excel.pe.Sheet([[1, 2],[3, 4]])
         return excel.make_response(sheet, "csv")
 
+License
+=============
+
+New BSD License
+
 Dependencies
 =============
 

django_excel/__init__.py

@@ -8,8 +8,6 @@
     :copyright: (c) 2015 by Onni Software Ltd.
     :license: New BSD License
 """
-
-
 from django.core.files.uploadhandler import MemoryFileUploadHandler, TemporaryFileUploadHandler
 from django.core.files.uploadedfile import InMemoryUploadedFile, TemporaryUploadedFile
 from django.http import HttpResponse

doc/source/conf.py

@@ -49,7 +49,7 @@
 
 # General information about the project.
 project = u'django-excel'
-copyright = u'2015, Onni Software Ltd.'
+copyright = u'2015 by Onni Software Ltd.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -202,7 +202,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   ('index', 'django-excel.tex', u'django-excel Documentation',
-   u'C. W.', 'manual'),
+   u'Onni Software Ltd.', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -232,7 +232,7 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'django-excel', u'django-excel Documentation',
-     [u'C. W.'], 1)
+     [u'Onni Software ltd.'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -246,7 +246,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'django-excel', u'django-excel Documentation',
-   u'C. W.', 'django-excel', 'One line description of project.',
+   u'Onni Software Ltd.', 'django-excel', 'One line description of project.',
    'Miscellaneous'),
 ]
 

doc/source/index.rst

@@ -9,7 +9,7 @@ Welcome to django-excel's documentation!
 :Author: C.W.
 :Source code: http://github.com/chfw/django-excel
 :Issues: http://github.com/chfw/django-excel/issues
-:License: GPL v3 or BSD
+:License: New BSD License
 :Version: |version|
 :Generated: |today|
 

setup.py

@@ -36,7 +36,6 @@
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Programming Language :: Python',
         'License :: OSI Approved :: BSD License',
-        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
         'Intended Audience :: Developers',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',