diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..de1a615 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Kenneth S. Kundert and Kale Kundert + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/doc/releases.rst b/doc/releases.rst index 55b4fe6..8ba511c 100644 --- a/doc/releases.rst +++ b/doc/releases.rst @@ -14,11 +14,11 @@ Releases | Version: 0.5.1 | Released: 2020-09-14 +**0.6 (2020-09-26)**: - Added :func:`load` and :func:`dump`. - Eliminated *NestedTextError.get_extended_codicil*. **0.5 (2020-09-11)**: - - allow user to manage duplicate keys detected by :func:`loads`. **0.4 (2020-09-07)**: diff --git a/nestedtext.py b/nestedtext.py index a18cabe..9506d36 100644 --- a/nestedtext.py +++ b/nestedtext.py @@ -3,21 +3,26 @@ NestedText: A Human Readable and Writable Data Format """ -# License {{{1 +# MIT License {{{1 # Copyright (c) 2020 Kenneth S. Kundert and Kale Kundert # -# This program is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation, either version 3 of the License, or (at your option) any later -# version. +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: # -# This program 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 General Public License for more -# details. +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. # -# You should have received a copy of the GNU General Public License along with -# this program. If not, see http://www.gnu.org/licenses/. +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # Imports {{{1 from inform import ( diff --git a/setup.py b/setup.py index aebcec0..f0a1936 100644 --- a/setup.py +++ b/setup.py @@ -10,8 +10,8 @@ long_description = readme, long_description_content_type = 'text/x-rst', author = "Ken Kundert and Kale Kundert", - author_email = 'nestedtext@nurdletech.com', - url = 'https://nestedtext.readthedocs.io', + author_email = 'admin@nestedtext.org', + url = 'https://nestedtext.org', download_url = 'https://github.com/kenkundert/nestedtext/tarball/master', license = 'GPLv3+', zip_safe = False, @@ -22,7 +22,7 @@ classifiers = [ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + 'License :: OSI Approved :: MIT License', 'Natural Language :: English', 'Operating System :: POSIX :: Linux', 'Programming Language :: Python :: 3.6',