From f6fc4c3488c7d3f123ba4ef665d1e28dde11e116 Mon Sep 17 00:00:00 2001 From: Bradley Ayers Date: Mon, 27 Jun 2011 17:28:47 +1000 Subject: [PATCH] Added LICENSE and bumped to v0.6.1 --- LICENSE | 36 ++++++++++++++++++++++++++++++++++++ docs/conf.py | 4 ++-- setup.py | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..5b111ca --- /dev/null +++ b/LICENSE @@ -0,0 +1,36 @@ +All changes made to django-tables2 since forking from django-tables +are Copyright (c) 2011, Bradley Ayers +All rights reserved. + +Redistribution is permitted under the same terms as the original +django-tables license. The original django-tables license is included +below. + + +Copyright (c) 2008, Michael Elsdörfer +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. + +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 OWNER 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. diff --git a/docs/conf.py b/docs/conf.py index 946d52a..8825eeb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -54,9 +54,9 @@ project = u'django-tables2' # built documents. # # The short X.Y version. -version = '0.6.0' +version = '0.6.1' # The full version, including alpha/beta/rc tags. -release = '0.6.0' +release = '0.6.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 34b3de6..47b05b9 100755 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages setup( name='django-tables2', - version='0.6.0', + version='0.6.1', description='Table framework for Django', author='Bradley Ayers', -- 2.26.2