Skip to content

Commit

Permalink
Relicense the package as MIT license. Drop licensing as PSF and Zope …
Browse files Browse the repository at this point in the history
…as neither of those licenses grant authority for use outside their respective projects. Vendored projects are licensed under their respective licenses, currently MIT for six and Apache v2 for packaging. Fixes #132.
  • Loading branch information
jaraco committed Jan 24, 2016
1 parent 3223234 commit d0bd7a5
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ def _gen_console_scripts():
"Python packages",
author="Python Packaging Authority",
author_email="distutils-sig@python.org",
license="PSF or ZPL",
long_description=long_description,
keywords="CPAN PyPI distutils eggs package management",
url="https://bitbucket.org/pypa/setuptools",
Expand Down Expand Up @@ -134,8 +133,7 @@ def _gen_console_scripts():
classifiers=textwrap.dedent("""
Development Status :: 5 - Production/Stable
Intended Audience :: Developers
License :: OSI Approved :: Python Software Foundation License
License :: OSI Approved :: Zope Public License
License :: OSI Approved :: MIT License
Operating System :: OS Independent
Programming Language :: Python :: 2.6
Programming Language :: Python :: 2.7
Expand Down

2 comments on commit d0bd7a5

@lfam
Copy link

@lfam lfam commented on d0bd7a5 Apr 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clarify which MIT license you are referring to, or include the text of the license?

"MIT License" is ambiguously used to refer to both the X11 and Expat licenses. The text of those licenses is available here:
https://en.wikipedia.org/wiki/MIT_License#Various_versions

@jaraco
Copy link
Member Author

@jaraco jaraco commented on d0bd7a5 Apr 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on what I read in that Wikipedia entry, the OSI Approved MSI license is the same as the expat license, so that's the one.

Please sign in to comment.