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.3 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.3 From 1b31a684e7198b9f46faaeddcae0cb94a0e43e84 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 19 Feb 2016 11:12:13 -0500 Subject: Add timestamps to changelog. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2aedfc12..a59d374d 100755 --- a/setup.py +++ b/setup.py @@ -67,7 +67,7 @@ if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \ needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv) pytest_runner = ['pytest-runner'] if needs_pytest else [] needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv) -sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else [] +sphinx = ['sphinx', 'rst.linker>=1.4'] if needs_sphinx else [] setup_params = dict( name="setuptools", -- cgit v1.2.3 From 3b90be7bb6323eb44d0f28864509c1d47aa098de Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 29 Mar 2016 12:17:06 -0400 Subject: Update most bitbucket references to point to Github now. Fixes #422. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a59d374d..b26190ff 100755 --- a/setup.py +++ b/setup.py @@ -78,7 +78,7 @@ setup_params = dict( author_email="distutils-sig@python.org", long_description=long_description, keywords="CPAN PyPI distutils eggs package management", - url="https://bitbucket.org/pypa/setuptools", + url="https://github.com/pypa/setuptools", src_root=src_root, packages=setuptools.find_packages(exclude=['*.tests']), package_data=package_data, -- cgit v1.2.3 From dd0c78d26b7510481bc4587c9bb5a6fbfd2b5c8d Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 29 Mar 2016 13:13:18 -0400 Subject: Just render the date and not the time of tagged releases in the changelog. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b26190ff..7986906d 100755 --- a/setup.py +++ b/setup.py @@ -67,7 +67,7 @@ if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \ needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv) pytest_runner = ['pytest-runner'] if needs_pytest else [] needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv) -sphinx = ['sphinx', 'rst.linker>=1.4'] if needs_sphinx else [] +sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else [] setup_params = dict( name="setuptools", -- cgit v1.2.3 From a04851c3e7b7e2b87f62d2de7e54c97c87881fcc Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 29 Mar 2016 14:12:30 -0400 Subject: Attempting a new streamlined, Travis-powered release process. --- setup.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7986906d..021edab3 100755 --- a/setup.py +++ b/setup.py @@ -22,11 +22,6 @@ with open(init_path) as init_file: SETUP_COMMANDS = command_ns['__all__'] -main_ns = {} -ver_path = convert_path('setuptools/version.py') -with open(ver_path) as ver_file: - exec(ver_file.read(), main_ns) - import setuptools scripts = [] @@ -68,10 +63,12 @@ needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv) pytest_runner = ['pytest-runner'] if needs_pytest else [] needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv) sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else [] +needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv) +wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version=main_ns['__version__'], + version="20.5", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", @@ -161,7 +158,7 @@ setup_params = dict( 'pytest>=2.8', ] + (['mock'] if sys.version_info[:2] < (3, 3) else []), setup_requires=[ - ] + sphinx + pytest_runner, + ] + sphinx + pytest_runner + wheel, ) if __name__ == '__main__': -- cgit v1.2.3 From af4b8f9370b9e18a9f5fe43e17161533e1a31646 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 29 Mar 2016 14:18:14 -0400 Subject: Follow semver to the letter for simplicity. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 021edab3..3e50cf5c 100755 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="20.5", + version="20.5.0", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", -- cgit v1.2.3 From 1627f58f4ca1d03bfc53d918373cb681a57d661d Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 29 Mar 2016 14:19:54 -0400 Subject: =?UTF-8?q?Bump=20version:=2020.5.0=20=E2=86=92=2020.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3e50cf5c..32d965bf 100755 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="20.5.0", + version="20.6.0", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", -- cgit v1.2.3 From 763d5ef1c8d382c6cd6f0dd247d7c6c9e3447a11 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 29 Mar 2016 14:31:17 -0400 Subject: =?UTF-8?q?Bump=20version:=2020.6.0=20=E2=86=92=2020.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 32d965bf..a07b803f 100755 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="20.6.0", + version="20.6.1", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", -- cgit v1.2.3 From 125066cb8dd2d44cc2ed9bded916840a59d4f1ac Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 29 Mar 2016 14:45:37 -0400 Subject: =?UTF-8?q?Bump=20version:=2020.6.1=20=E2=86=92=2020.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a07b803f..e96c4a0d 100755 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="20.6.1", + version="20.6.2", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", -- cgit v1.2.3 From 9bc17cf4cd018979b1d56bf3e2b14651bc451bcc Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 29 Mar 2016 14:52:13 -0400 Subject: =?UTF-8?q?Bump=20version:=2020.6.2=20=E2=86=92=2020.6.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e96c4a0d..202da449 100755 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="20.6.2", + version="20.6.3", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", -- cgit v1.2.3 From 26004981b800a24654a43d88fc0d609d247ca9b7 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 29 Mar 2016 15:00:19 -0400 Subject: =?UTF-8?q?Bump=20version:=2020.6.3=20=E2=86=92=2020.6.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 202da449..a16dafe6 100755 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="20.6.3", + version="20.6.4", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", -- cgit v1.2.3 From fbbeb19d4c7662844e7af5cb1fea4d7cc95ff146 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 29 Mar 2016 16:18:51 -0400 Subject: =?UTF-8?q?Bump=20version:=2020.6.4=20=E2=86=92=2020.6.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a16dafe6..14219945 100755 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="20.6.4", + version="20.6.5", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", -- cgit v1.2.3 From 53a9c83a227c1277165a1bdec013bbb4465edd8f Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 30 Mar 2016 21:58:23 -0400 Subject: =?UTF-8?q?Bump=20version:=2020.6.5=20=E2=86=92=2020.6.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 14219945..c559befa 100755 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="20.6.5", + version="20.6.6", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", -- cgit v1.2.3 From 11f68796ae1fb41a1318b58b89868a933e3b4c74 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 30 Mar 2016 22:09:19 -0400 Subject: Ensure sphinx is present for building docs --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c559befa..1aa31687 100755 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \ needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv) pytest_runner = ['pytest-runner'] if needs_pytest else [] -needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv) +needs_sphinx = set(['build_sphinx', 'upload_docs', 'release']).intersection(sys.argv) sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else [] needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv) wheel = ['wheel'] if needs_wheel else [] -- cgit v1.2.3 From d48e839e34b1dc4f64707935f58e4bc0824457c0 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 31 Mar 2016 10:47:10 -0400 Subject: =?UTF-8?q?Bump=20version:=2020.6.6=20=E2=86=92=2020.6.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1aa31687..9067abe2 100755 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="20.6.6", + version="20.6.7", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", -- cgit v1.2.3 From c5189c3992f32dcabf5cb294340bf4cad294de23 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 1 Apr 2016 17:01:51 -0400 Subject: Rename CHANGES and README files for nicer rendering on Github. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1aa31687..573fb595 100755 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def _gen_console_scripts(): console_scripts = list(_gen_console_scripts()) -readme_file = io.open('README.txt', encoding='utf-8') +readme_file = io.open('README.rst', encoding='utf-8') with readme_file: long_description = readme_file.read() -- cgit v1.2.3