Skip to content

Commit

Permalink
Switch to BSD license.
Browse files Browse the repository at this point in the history
  • Loading branch information
lepture committed Jan 1, 2019
1 parent a017d0c commit 0561385
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 46 deletions.
22 changes: 10 additions & 12 deletions LICENSE
@@ -1,16 +1,14 @@
License of Authlib (AGPLv3+) Copyright (c) 2019, Hsiaoming Yang


Copyright (C) 2017 Hsiaoming Yang All rights reserved.


This program is free software: you can redistribute it and/or modify Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
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.


This program is distributed in the hope that it will be useful, * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
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 * 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.
along with this program. If not, see <https://www.gnu.org/licenses/>.
* Neither the name of the creator 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.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -227,7 +227,7 @@ You can also find it at <https://keybase.io/lepture>.


## License ## License


Authlib is licensed under AGPLv3+. Please see LICENSE for licensing details. Authlib is licensed under BSD. Please see LICENSE for licensing details.


If this license does not fit your company, consider to purchase a commercial If this license does not fit your company, consider to purchase a commercial
license. Find more information on [Authlib Plans](https://authlib.org/plans). license. Find more information on [Authlib Plans](https://authlib.org/plans).
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -47,7 +47,7 @@ Implementations
License License
------- -------


Authlib is licensed under AGPLv3+. Please see LICENSE for licensing details. Authlib is licensed under BSD. Please see LICENSE for licensing details.


If this license does not fit your company, consider to purchase a commercial If this license does not fit your company, consider to purchase a commercial
license. Find more information on `Authlib Plans`_. license. Find more information on `Authlib Plans`_.
Expand Down
4 changes: 2 additions & 2 deletions authlib/__init__.py
Expand Up @@ -7,11 +7,11 @@
implementation to high level framework integrations. implementation to high level framework integrations.
:copyright: (c) 2017 by Hsiaoming Yang. :copyright: (c) 2017 by Hsiaoming Yang.
:license: AGPLv3+, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
from .consts import version, homepage, author from .consts import version, homepage, author


__version__ = version __version__ = version
__homepage__ = homepage __homepage__ = homepage
__author__ = author __author__ = author
__license__ = 'AGPLv3+' __license__ = 'BSD'
20 changes: 20 additions & 0 deletions docs/changelog.rst
Expand Up @@ -6,6 +6,26 @@ Changelog


Here you can see the full list of changes between each Authlib release. Here you can see the full list of changes between each Authlib release.


Version 0.11
------------

**Release Date not decided yet.**

**BIG NEWS**: Authlib has changed its open source license from AGPL to BSD.

RFC implementations and updates in this release:

- RFC7518: Added A128GCMKW, A192GCMKW, A256GCMKW algorithms for JWE.
- RFC5849: Removed draft-eaton-oauth-bodyhash-00 spec for OAuth 1.0.

Small changes and bug fixes in this release:

- Fixed missing scope on password and client_credentials grant types
of ``OAuth2Session`` via :gh:`issue#96`.
- Fixed Flask OAuth client cache detection via :gh:`issue#98`.
- Enabled ssl certificates for ``OAuth2Session`` via :gh:`PR#100`, thanks
to pingz.

Version 0.10: Kluke Version 0.10: Kluke
------------------- -------------------


Expand Down
54 changes: 27 additions & 27 deletions docs/community/licenses.rst
@@ -1,45 +1,45 @@
Authlib Licenses Authlib Licenses
================ ================


Authlib offers two licenses, one is APGLv3+ for open source projects, one is Authlib offers two licenses, one is BSD for open source projects, one is
a commercial license for closed source projects. a commercial license for closed source projects.


Open Source License Open Source License
------------------- -------------------


Copyright (C) 2017 Hsiaoming Yang Copyright (c) 2019, Hsiaoming Yang


This program is free software: you can redistribute it and/or modify All rights reserved.
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.


This program is distributed in the hope that it will be useful, Redistribution and use in source and binary forms, with or without
but WITHOUT ANY WARRANTY; without even the implied warranty of modification, are permitted provided that the following conditions are met:
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 * Redistributions of source code must retain the above copyright notice, this
along with this program. If not, see <https://www.gnu.org/licenses/>. list of conditions and the following disclaimer.


Commercial License * 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 content of the commercial license can be found in the repository in a file * Neither the name of the creator nor the names of its contributors may be
named **COMMERCIAL-LICENSE**. You can buy a license at: used to endorse or promote products derived from this software without
specific prior written permission.


https://authlib.org/plans 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.


Discuss on License Commercial License
------------------ ------------------


There is a discuss on the license issue. I personally don't think AGPL is a The content of the commercial license can be found in the repository in a file
good license for Authlib either. If you have a better understanding of licenses named **COMMERCIAL-LICENSE**. You can get a commercial license at:
issues, you can offer your suggestions at:

https://github.com/lepture/authlib/issues/59


.. note:: https://authlib.org/plans
Authlib will be separated into 3 modules in the future. The client part
will be licensed under BSD, the server part will remain AGPL (or BSD with
Common Clause).
2 changes: 1 addition & 1 deletion docs/community/sustainable.rst
Expand Up @@ -28,7 +28,7 @@ supporter, a backer or a company sponsor.
Commercial License Commercial License
------------------ ------------------


Authlib is licensed under AGPLv3+, if this license doesn't fit your company, Authlib is licensed under BSD, if this license doesn't fit your company,
consider to purchase a commercial license. consider to purchase a commercial license.


Find more information on Find more information on
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -29,7 +29,7 @@
include_package_data=True, include_package_data=True,
platforms='any', platforms='any',
long_description=readme, long_description=readme,
license='GNU AGPLv3+', license='BSD',
install_requires=client_requires + crypto_requires, install_requires=client_requires + crypto_requires,
project_urls={ project_urls={
'Documentation': 'https://docs.authib.org/', 'Documentation': 'https://docs.authib.org/',
Expand All @@ -45,7 +45,7 @@
'Framework :: Flask', 'Framework :: Flask',
'Framework :: Django', 'Framework :: Django',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent', 'Operating System :: OS Independent',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2',
Expand Down

0 comments on commit 0561385

Please sign in to comment.