Permalink
Browse files

Dual-licensed under AGPLv3 and BSD. This is required to fix issue #14.

  • Loading branch information...
1 parent 3bd0431 commit 0cd8cb0fbe848d8c29c58609c97d5e9b67233240 @jfinkels committed Apr 9, 2012
View
View
File renamed without changes.
View
@@ -0,0 +1,25 @@
+Copyright 2011 Lincoln de Sousa
+Copyright 2012 Jeffrey Finkelstein
+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.
+* The names of the contributors may not 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.
View
@@ -23,10 +23,16 @@ For more information, check the World Wide Web!
## Copyright license ##
-The code comprising this program is copyright 2011 Lincoln de Sousa and 2012
-Jeffrey Finkelstein, and is published under the GNU Affero General Public
-License, either version 3 or (at your option) any later version. For more
-information see the `COPYING` file.
+The code comprising this program is copyright 2011 Lincoln de Sousa and
+copyright 2012 Jeffrey Finkelstein, and is dual-licensed under the following
+two copyright licenses:
+
+* the GNU Affero General Public License, either version 3 or (at your option)
+ any later version
+* the 3-clause BSD License
+
+For more information, see the files `LICENSE.AGPL` and `LICENSE.BSD` in this
+directory.
## Contents ##
View
@@ -1,9 +1,16 @@
Copyright and license
=====================
+
Flask-Restless is copyright 2011 Lincoln de Sousa and copyright 2012 Jeffrey
-Finkelstein. It is licensed under the `GNU Affero General Public License,
-version 3 <http://fsf.org/licenses/agpl.html>`_ or later.
+Finkelstein, and is dual-licensed under the following two copyright licenses:
+
+* the `GNU Affero General Public License <http://fsf.org/licenses/agpl.html>`_,
+ either version 3 or (at your option) any later version
+* the 3-clause BSD License
+
+For more information, see the files :file:`LICENSE.AGPL` and
+:file:`LICENSE.BSD` in top-level directory of the source distribution.
The artwork for Flask-Restless is copyright 2012 Jeffrey Finkelstein. The couch
logo is licensed under the `Creative Commons Attribute-ShareAlike 3.0 license
@@ -1,21 +1,3 @@
-# -*- coding: utf-8; Mode: Python -*-
-#
-# Copyright 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
-#
-# This file is part of Flask-Restless.
-#
-# Flask-Restless is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# Flask-Restless is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Flask-Restless. If not, see <http://www.gnu.org/licenses/>.
"""
Authentication example using Flask-Login
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -52,7 +34,7 @@
make :http:get:`http://localhost:5000/api/user` requests.
:copyright: 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
- :license: GNU AGPLv3, see COPYING for more details
+ :license: GNU AGPLv3 or BSD
"""
import os
@@ -1,21 +1,3 @@
-# -*- coding: utf-8; Mode: Python -*-
-#
-# Copyright 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
-#
-# This file is part of Flask-Restless.
-#
-# Flask-Restless is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# Flask-Restless is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Flask-Restless. If not, see <http://www.gnu.org/licenses/>.
"""
Using Flask-Restless with jQuery
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,7 +30,7 @@
browser for this example to work.
:copyright: 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
- :license: GNU AGPLv3, see COPYING for more details
+ :license: GNU AGPLv3 or BSD
"""
import os
@@ -1,21 +1,3 @@
-# -*- coding: utf-8; Mode: Python -*-
-#
-# Copyright 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
-#
-# This file is part of Flask-Restless.
-#
-# Flask-Restless is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# Flask-Restless is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Flask-Restless. If not, see <http://www.gnu.org/licenses/>.
"""
Separate URLs example
~~~~~~~~~~~~~~~~~~~~~
@@ -28,7 +10,7 @@
using :http:get:`http://localhost:5000/add/person`, etc.
:copyright: 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
- :license: GNU AGPLv3, see COPYING for more details
+ :license: GNU AGPLv3 or BSD
"""
import flask
View
@@ -1,21 +1,3 @@
-# -*- coding: utf-8; Mode: Python -*-
-#
-# Copyright 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
-#
-# This file is part of Flask-Restless.
-#
-# Flask-Restless is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# Flask-Restless is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Flask-Restless. If not, see <http://www.gnu.org/licenses/>.
"""
flask.ext.restless
~~~~~~~~~~~~~~~~~~
@@ -24,9 +6,9 @@
facilitates the creation of ReSTful JSON APIs. It is compatible with models
which have been described using `SQLAlchemy <http://sqlalchemy.org>`_.
- :copyright: 2011 by Lincoln de Sousa <lincoln@comum.org>
- :copyright: 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
- :license: GNU Affero General Public License, version 3 or later.
+ :copyright:2011 by Lincoln de Sousa <lincoln@comum.org>
+ :copyright:2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
+ :license: GNU AGPLv3, see COPYING for more details
"""
View
@@ -1,22 +1,3 @@
-# -*- coding: utf-8; Mode: Python -*-
-#
-# Copyright (C) 2011 Lincoln de Sousa <lincoln@comum.org>
-# Copyright 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
-#
-# This file is part of Flask-Restless.
-#
-# Flask-Restless is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# Flask-Restless is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Flask-Restless. If not, see <http://www.gnu.org/licenses/>.
"""
flask.ext.restless.manager
~~~~~~~~~~~~~~~~~~~~~~~~~~
View
@@ -1,22 +1,3 @@
-# -*- coding: utf-8; Mode: Python -*-
-#
-# Copyright (C) 2011 Lincoln de Sousa <lincoln@comum.org>
-# Copyright 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
-#
-# This file is part of Flask-Restless.
-#
-# Flask-Restless is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# Flask-Restless is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Flask-Restless. If not, see <http://www.gnu.org/licenses/>.
"""
flask.ext.restless.search
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -27,9 +8,9 @@
and :func:`search` functions, which create a SQLAlchemy query object and
execute that query on a given model, respectively.
- :copyright:2011 by Lincoln de Sousa <lincoln@comum.org>
- :copyright:2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
- :license: GNU AGPLv3, see COPYING for more details
+ :copyright: 2011 by Lincoln de Sousa <lincoln@comum.org>
+ :copyright: 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
+ :license: GNU AGPLv3 or BSD
"""
import inspect
View
@@ -1,22 +1,3 @@
-# -*- coding: utf-8; Mode: Python -*-
-#
-# Copyright (C) 2011 Lincoln de Sousa <lincoln@comum.org>
-# Copyright 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
-#
-# This file is part of Flask-Restless.
-#
-# Flask-Restless is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# Flask-Restless is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Flask-Restless. If not, see <http://www.gnu.org/licenses/>.
"""
flask.ext.restless.views
~~~~~~~~~~~~~~~~~~~~~~~~
@@ -35,9 +16,9 @@
Provides a :http:method:`get` endpoint which returns the result of
evaluating some function on the entire collection of a given model.
- :copyright:2011 by Lincoln de Sousa <lincoln@comum.org>
- :copyright:2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
- :license: GNU AGPLv3, see COPYING for more details
+ :copyright: 2011 by Lincoln de Sousa <lincoln@comum.org>
+ :copyright: 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
+ :license: GNU AGPLv3 or BSD
"""
import datetime
View
@@ -1,22 +1,3 @@
-# -*- coding: utf-8; Mode: Python -*-
-#
-# Copyright (C) 2011 Lincoln de Sousa <lincoln@comum.org>
-# Copyright 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
-#
-# This file is part of Flask-Restless.
-#
-# Flask-Restless is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# Flask-Restless is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Flask-Restless. If not, see <http://www.gnu.org/licenses/>.
"""
Flask-Restless
~~~~~~~~~~~~~~
@@ -96,6 +77,7 @@ def run(self):
'Development Status :: 4 - Beta',
'Environment :: Web Environment',
'Intended Audience :: Developers',
+ 'License :: OSI Approved :: BSD License',
'License :: OSI Approved :: GNU Affero General Public License v3',
'Operating System :: OS Independent',
'Programming Language :: Python',
@@ -109,7 +91,7 @@ def run(self):
install_requires=requirements,
include_package_data=True,
keywords=['ReST', 'API', 'Flask', 'Elixir'],
- license='GNU AGPLv3+',
+ license='GNU AGPLv3+ or BSD',
long_description=__doc__,
name='Flask-Restless',
platforms='any',
View
@@ -1,21 +1,3 @@
-# -*- coding: utf-8; Mode: Python -*-
-#
-# Copyright 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
-#
-# This file is part of Flask-Restless.
-#
-# Flask-Restless is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# Flask-Restless is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Flask-Restless. If not, see <http://www.gnu.org/licenses/>.
"""
Flask-Restless unit tests
~~~~~~~~~~~~~~~~~~~~~~~~~
View
@@ -1,21 +1,3 @@
-# -*- coding: utf-8; Mode: Python -*-
-#
-# Copyright 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
-#
-# This file is part of Flask-Restless.
-#
-# Flask-Restless is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# Flask-Restless is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Flask-Restless. If not, see <http://www.gnu.org/licenses/>.
"""
Flask-Restless unit test runner
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -31,8 +13,10 @@
python -m tests.__main__
+
:copyright: 2012 Jeffrey Finkelstein <jeffrey.finkelstein@gmail.com>
- :license: GNU AGPLv3, see COPYING for more details
+ :license: GNU AGPLv3 or BSD
+
"""
import unittest2
Oops, something went wrong.

0 comments on commit 0cd8cb0

Please sign in to comment.