From 2b3cf9b12b23ac6beca6808c4c7620aa77f168e3 Mon Sep 17 00:00:00 2001 From: Darjus Loktevic Date: Mon, 11 Jan 2016 23:23:36 +1100 Subject: Remove JythonCommandSpec as it's not required on Jython 2.7 and setuptools no longer supports anything 2.5, but had to test for 'Jython on Windows' in two other places --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index dfb578a1..5378e6c5 100755 --- a/setup.py +++ b/setup.py @@ -59,7 +59,8 @@ force_windows_specific_files = ( os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES") not in (None, "", "0") ) -if sys.platform == 'win32' or force_windows_specific_files: +if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \ + or force_windows_specific_files: package_data.setdefault('setuptools', []).extend(['*.exe']) package_data.setdefault('setuptools.command', []).extend(['*.xml']) -- cgit v1.2.1 From d0bd7a5612088e5da516c0b183c2b8a04a0e5306 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 23 Jan 2016 20:57:04 -0500 Subject: Relicense the package as MIT license. Drop licensing as PSF and Zope 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. --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index dfb578a1..c7cd364b 100755 --- a/setup.py +++ b/setup.py @@ -75,7 +75,6 @@ setup_params = dict( "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", @@ -134,8 +133,7 @@ setup_params = dict( 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 -- cgit v1.2.1