From 025b0a2957c06335f539ec2d92ac3da00c9658ed Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 22 Sep 2015 20:03:14 +0200 Subject: [PATCH 1/2] use more conservative rule to pull in setuptools setuptools shouldn't be used for 'sdist upload' --- setup.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 3d7587fa9..8718b8853 100755 --- a/setup.py +++ b/setup.py @@ -130,14 +130,7 @@ setup_args['cmdclass'] = { # Handle scripts, dependencies, and setuptools specific things #--------------------------------------------------------------------------- -# For some commands, use setuptools. Note that we do NOT list install here! -# If you want a setuptools-enhanced install, just run 'setupegg.py install' -needs_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm', - 'bdist', 'bdist_dumb', 'bdist_wininst', 'bdist_wheel', - 'egg_info', 'easy_install', 'upload', 'install_egg_info', - )) - -if len(needs_setuptools.intersection(sys.argv)) > 0: +if any(arg.startswith('bdist') for arg in sys.argv): import setuptools # This dict is used for passing extra arguments that are setuptools From fda86ad301ef96b6d0e405dbd0f3230ba835325a Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 22 Sep 2015 20:16:06 +0200 Subject: [PATCH 2/2] formatting for long_description --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 8718b8853..d8c21d740 100755 --- a/setup.py +++ b/setup.py @@ -67,13 +67,13 @@ setup_args = dict( name = name, description = "A web-based notebook environment for interactive computing", long_description = """ - The Jupyter Notebook is a web application that allows you to create and - share documents that contain live code, equations, visualizations, and - explanatory text. The Notebook has support for multiple programming - languages, sharing, and interactive widgets. +The Jupyter Notebook is a web application that allows you to create and +share documents that contain live code, equations, visualizations, and +explanatory text. The Notebook has support for multiple programming +languages, sharing, and interactive widgets. - Read `the documentation`_ - for more information. +Read `the documentation `_ +for more information. """, version = version, scripts = glob(pjoin('scripts', '*')),