Skip to content

Commit

Permalink
Relicense as zlib.
Browse files Browse the repository at this point in the history
  • Loading branch information
anntzer committed Oct 18, 2023
1 parent b75bae1 commit b68358b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 18 deletions.
30 changes: 14 additions & 16 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
Copyright (c) 2016-2017 Antony Lee
Copyright (c) 2016-present Antony Lee

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 software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

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.
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
long_description_content_type="text/x-rst",
author="Antony Lee",
url="https://github.com/anntzer/ipython-autoimport",
license="MIT",
license="zlib",
classifiers=[
"Development Status :: 4 - Beta",
"Framework :: IPython",
"License :: OSI Approved :: MIT License",
"License :: OSI Approved :: zlib/libpng License",
"Programming Language :: Python :: 3",
],
py_modules=["ipython_autoimport"],
Expand Down

0 comments on commit b68358b

Please sign in to comment.