changeset 4:f76d85ccc5b9

Switch to the "New BSD License"
author Franz Glasner <f.glasner@feldmann-mg.com>
date Tue, 08 Mar 2016 16:46:27 +0100
parents bedc4f95b9e9
children dc058099a4cb
files LICENSE MANIFEST.in mixconfig/__init__.py setup.py
diffstat 4 files changed, 40 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE	Tue Mar 08 16:46:27 2016 +0100
@@ -0,0 +1,30 @@
+Copyright (c) 2015, Franz Glasner
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. 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.
+
+3. Neither the name of the copyright holder 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.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MANIFEST.in	Tue Mar 08 16:46:27 2016 +0100
@@ -0,0 +1,1 @@
+include .hg_archival.txt LICENSE
--- a/mixconfig/__init__.py	Tue Mar 08 16:25:36 2016 +0100
+++ b/mixconfig/__init__.py	Tue Mar 08 16:46:27 2016 +0100
@@ -1,4 +1,11 @@
 # -*- coding: utf-8 -*-
+r"""
+
+:Author:   Franz Glasner
+:License:  BSD License.
+           See LICENSE for details.
+
+"""
 #
 # NOTE: ONLY STANDARDLIB-IMPORTS IN THIS MODULE.
 #       ITS JUST FOR BOOTSTRAPPING WITH PYTHON2 and PYTHON3.
--- a/setup.py	Tue Mar 08 16:25:36 2016 +0100
+++ b/setup.py	Tue Mar 08 16:46:27 2016 +0100
@@ -30,7 +30,7 @@
     name="MixConfig",
     version=version,
     author="Franz Glasner",
-#    license='BSD',
+    license="BSD",
     url="https://pypi.dom66.de/simple/mixconfig/",
     description="Library for extended configuration files",
     long_description=long_description,
@@ -42,7 +42,7 @@
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "Intended Audience :: Developers",
-#        'License :: OSI Approved :: BSD License',
+        "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",