Initial work towards refactoring the setup.py scripts to accept the new ipython1 packages

that have been merged.  I am also bringing in a new way for checking dependencies at
build time that is simple, but really helpful now that we have lots of optional
dependencies.

setupbase.py

@@ -0,0 +1,201 b''
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os, sys
+
+from glob import glob
+
+from setupext import install_data_ext
+
+#-------------------------------------------------------------------------------
+# Useful globals and utility functions
+#-------------------------------------------------------------------------------
+
+# A few handy globals
+isfile = os.path.isfile
+pjoin = os.path.join
+
+def oscmd(s):
+    print ">", s
+    os.system(s)
+
+# A little utility we'll need below, since glob() does NOT allow you to do
+# exclusion on multiple endings!
+def file_doesnt_endwith(test,endings):
+    """Return true if test is a file and its name does NOT end with any
+    of the strings listed in endings."""
+    if not isfile(test):
+        return False
+    for e in endings:
+        if test.endswith(e):
+            return False
+    return True
+
+#---------------------------------------------------------------------------
+# Basic project information
+#---------------------------------------------------------------------------
+
+# Release.py contains version, authors, license, url, keywords, etc.
+execfile(pjoin('IPython','Release.py'))
+
+# Create a dict with the basic information
+# This dict is eventually passed to setup after additional keys are added.
+setup_args = dict(
+      name             = name,
+      version          = version,
+      description      = description,
+      long_description = long_description,
+      author           = author,
+      author_email     = author_email,
+      url              = url,
+      download_url     = download_url,
+      license          = license,
+      platforms        = platforms,
+      keywords         = keywords,
+      cmdclass         = {'install_data': install_data_ext},
+      )
+
+
+#---------------------------------------------------------------------------
+# Find packages
+#---------------------------------------------------------------------------
+
+def add_package(packages, pname, config=False, tests=False, scripts=False, others=None):
+    packages.append('.'.join(['ipython1',pname]))
+    if config:
+        packages.append('.'.join(['ipython1',pname,'config']))
+    if tests:
+        packages.append('.'.join(['ipython1',pname,'tests']))
+    if scripts:
+        packages.append('.'.join(['ipython1',pname,'scripts']))
+    if others is not None:
+        for o in others:
+            packages.append('.'.join(['ipython1',pname,o]))
+
+def find_packages():
+    packages = ['ipython']
+    add_package(packages, 'config', tests=True)
+    add_package(packages , 'Extensions')
+    add_package(packages, 'external')
+    add_package(packages, 'gui')
+    add_package(packages, 'gui.wx')
+    add_package(packages, 'kernel', config=True, tests=True, scripts=True)
+    add_package(packages, 'kernel.core', config=True, tests=True)
+    add_package(packages, 'testing', tests=True)
+    add_package(packages, 'tools', tests=True)
+    add_package(packages, 'UserConfig')
+    return packages
+
+#---------------------------------------------------------------------------
+# Find package data
+#---------------------------------------------------------------------------
+
+def find_package_data():
+    # This is not enough for these things to appear in an sdist.
+    # We need to muck with the MANIFEST to get this to work
+    package_data = {'IPython.UserConfig' : ['*'] }
+    return package_data
+
+
+#---------------------------------------------------------------------------
+# Find data files
+#---------------------------------------------------------------------------
+
+def find_data_files():
+    
+    # I can't find how to make distutils create a nested dir. structure, so
+    # in the meantime do it manually. Butt ugly.
+    # Note that http://www.redbrick.dcu.ie/~noel/distutils.html, ex. 2/3, contain
+    # information on how to do this more cleanly once python 2.4 can be assumed.
+    # Thanks to Noel for the tip.
+    docdirbase  = 'share/doc/ipython'
+    manpagebase = 'share/man/man1'
+
+    # We only need to exclude from this things NOT already excluded in the
+    # MANIFEST.in file.
+    exclude     = ('.sh','.1.gz')
+    docfiles    = filter(lambda f:file_doesnt_endwith(f,exclude),glob('doc/*'))
+    examfiles   = filter(isfile, glob('doc/examples/*.py'))
+    manfiles    = filter(isfile, glob('doc/manual/*'))
+    manstatic   = filter(isfile, glob('doc/manual/_static/*'))
+    manpages    = filter(isfile, glob('doc/*.1.gz'))
+    scriptfiles = filter(isfile, ['scripts/ipython','scripts/pycolor',
+                                  'scripts/irunner'])
+    igridhelpfiles = filter(isfile, glob('IPython/Extensions/igrid_help.*'))
+    
+    data_files = [('data', docdirbase, docfiles),
+                 ('data', pjoin(docdirbase, 'examples'),examfiles),
+                 ('data', pjoin(docdirbase, 'manual'),manfiles),
+                 ('data', pjoin(docdirbase, 'manual/_static'),manstatic),
+                 ('data', manpagebase, manpages),
+                 ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
+                 ]
+    return data_files
+
+#---------------------------------------------------------------------------
+# Find scripts
+#---------------------------------------------------------------------------
+
+def find_scripts():
+    scripts = []
+    scripts.append('ipython1/kernel/scripts/ipengine')
+    scripts.append('ipython1/kernel/scripts/ipcontroller')
+    scripts.append('ipython1/kernel/scripts/ipcluster')
+    scripts.append('scripts/ipython')
+    scripts.append('scripts/pycolor')
+    scripts.append('scripts/irunner')
+    
+    # Script to be run by the windows binary installer after the default setup
+    # routine, to add shortcuts and similar windows-only things.  Windows
+    # post-install scripts MUST reside in the scripts/ dir, otherwise distutils
+    # doesn't find them.
+    if 'bdist_wininst' in sys.argv:
+        if len(sys.argv) > 2 and ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
+            print >> sys.stderr,"ERROR: bdist_wininst must be run alone. Exiting."
+            sys.exit(1)
+        scripts.append('scripts/ipython_win_post_install.py')
+    
+    return scripts
+
+#---------------------------------------------------------------------------
+# Find scripts
+#---------------------------------------------------------------------------
+
+def check_for_dependencies():
+    from setupext.setupext import (
+        print_line, print_raw, print_status, print_message,
+        check_for_zopeinterface, check_for_twisted,
+        check_for_foolscap, check_for_pyopenssl,
+        check_for_sphinx, check_for_pygments,
+        check_for_nose, check_for_pexpect
+    )
+    print_line()
+    print_raw("BUILDING IPYTHON")
+    print_status('python', sys.version)
+    print_status('platform', sys.platform)
+    if sys.platform == 'win32':
+        print_status('Windows version', sys.getwindowsversion())
+    
+    print_raw("")
+    print_raw("OPTIONAL DEPENDENCIES")
+
+    check_for_zopeinterface()
+    check_for_twisted()
+    check_for_foolscap()
+    check_for_pyopenssl()
+    check_for_sphinx()
+    check_for_pygments()
+    check_for_nose()
+    check_for_pexpect()
  No newline at end of file

setupext/setupext.py

@@ -0,0 +1,177 b''
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import sys, os
+from textwrap import fill
+
+display_status=True
+
+if display_status:
+    def print_line(char='='):
+        print char * 76
+
+    def print_status(package, status):
+        initial_indent = "%22s: " % package
+        indent = ' ' * 24
+        print fill(str(status), width=76,
+                   initial_indent=initial_indent,
+                   subsequent_indent=indent)
+
+    def print_message(message):
+        indent = ' ' * 24 + "* "
+        print fill(str(message), width=76,
+                   initial_indent=indent,
+                   subsequent_indent=indent)
+
+    def print_raw(section):
+        print section
+else:
+    def print_line(*args, **kwargs):
+        pass
+    print_status = print_message = print_raw = print_line
+
+#-------------------------------------------------------------------------------
+# Tests for specific packages
+#-------------------------------------------------------------------------------
+
+def check_for_ipython():
+    try:
+        import IPython
+    except ImportError:
+        print_status("IPython", "Not found")
+        return False
+    else:
+        print_status("IPython", IPython.__version__)
+        return True
+
+def check_for_zopeinterface():
+    try:
+        import zope.interface
+    except ImportError:
+        print_status("zope.Interface", "Not found (required for parallel computing capabilities)")
+        return False
+    else:
+        print_status("Zope.Interface","yes")
+        return True
+        
+def check_for_twisted():
+    try:
+        import twisted
+    except ImportError:
+        print_status("Twisted", "Not found (required for parallel computing capabilities)")
+        return False
+    else:
+        major = twisted.version.major
+        minor = twisted.version.minor
+        micro = twisted.version.micro
+        if not ((major==2 and minor>=5 and micro>=0) or \
+                major>=8):
+            print_message("WARNING: IPython requires Twisted 2.5.0 or greater, you have version %s"%twisted.version.short())
+            return False
+        else:
+            print_status("Twisted", twisted.version.short())
+            return True
+
+def check_for_foolscap():
+    try:
+        import foolscap
+    except ImportError:
+        print_status('Foolscap', "Not found (required for parallel computing capabilities)")
+        return False
+    else:
+        print_status('Foolscap', foolscap.__version__)
+        return True
+
+def check_for_pyopenssl():
+    try:
+        import OpenSSL
+    except ImportError:
+        print_status('OpenSSL', "Not found (required if you want security in the parallel computing capabilities)")
+        return False
+    else:
+        print_status('OpenSSL', OpenSSL.__version__)    
+        return True
+
+def check_for_sphinx():
+    try:
+        import sphinx
+    except ImportError:
+        print_status('sphinx', "Not found (required for building the IPtyhon documentation)")
+        return False
+    else:
+        print_status('sphinx', sphinx.__version__) 
+        return True
+
+def check_for_pygments():
+    try:
+        import pygments
+    except ImportError:
+        print_status('pygments', "Not found (required for syntax highlighting of code in the IPtyhon documentation)")
+        return False
+    else:
+        print_status('pygments', pygments.__version__)
+        return True
+
+def check_for_nose():
+    try:
+        import nose
+    except ImportError:
+        print_status('nose', "Not found (required for running the IPython test suite)")
+        return False
+    else:
+        print_status('nose', nose.__version__)
+        return True
+
+def check_for_pexpect():
+    try:
+        import pexpect
+    except ImportError:
+        print_status("pexpect", "no (required for running standalone doctests)")
+        return False
+    else:
+        print_status("pexpect", pexpect.__version__)
+        return True
+
+def check_for_httplib2():
+    try:
+        import httplib2
+    except ImportError:
+        print_status("httplib2", "no (required for blocking http clients)")
+        return False
+    else:
+        print_status("httplib2","yes")
+        return True
+
+def check_for_sqlalchemy():
+    try:
+        import sqlalchemy
+    except ImportError:
+        print_status("sqlalchemy", "no (required for the ipython1 notebook)")
+        return False
+    else:
+        print_status("sqlalchemy","yes")
+        return True
+
+def check_for_simplejson():
+    try:
+        import simplejson
+    except ImportError:
+        print_status("simplejson", "no (required for the ipython1 notebook)")
+        return False
+    else:
+        print_status("simplejson","yes")
+        return True
+
+        
  No newline at end of file

IPython/Release.py

@@ -32,7 +32,7 b' else:'
 
 version = '0.8.4'
 
-description = "An enhanced interactive Python shell."
+description = "Tools for interactive development in Python."
 
 long_description = \
 """
@@ -77,13 +77,19 b" license = 'BSD'"
 authors = {'Fernando' : ('Fernando Perez','[e-mail]'),
            'Janko'    : ('Janko Hauser','[e-mail]'),
            'Nathan'   : ('Nathaniel Gray','[e-mail]'),
-           'Ville'    : ('Ville Vainio','[e-mail]')           
+           'Ville'    : ('Ville Vainio','[e-mail]'),
+           'Brian'    : ('Brian E Granger', '[e-mail]'),
+           'Min'      : ('Min Ragan-Kelley', '[e-mail]')
            }
 
+author = 'The IPython Development Team'
+
+author_email = '[e-mail]'
+
 url = 'http://ipython.scipy.org'
 
 download_url = 'http://ipython.scipy.org/dist'
 
 platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME']
 
-keywords = ['Interactive','Interpreter','Shell']
+keywords = ['Interactive','Interpreter','Shell','Parallel','Distributed']

IPython/kernel/tests/controllertest.py

@@ -28,7 +28,7 b' import zope.interface as zi'
 
 from IPython.kernel import engineservice as es
 from IPython.kernel import error
-from IPython.testutils.util import DeferredTestCase
+from IPython.testing.util import DeferredTestCase
 from IPython.kernel.controllerservice import \
     IControllerCore
 

IPython/kernel/tests/engineservicetest.py

@@ -27,7 +27,7 b' from IPython.kernel import error'
 from IPython.kernel.pickleutil import can, uncan
 import IPython.kernel.engineservice as es
 from IPython.kernel.core.interpreter import Interpreter
-from IPython.testutils.parametric import Parametric, parametric
+from IPython.testing.parametric import Parametric, parametric
 
 #-------------------------------------------------------------------------------
 # Tests

IPython/kernel/tests/multienginetest.py

@@ -21,8 +21,8 b' from IPython.kernel import engineservice as es'
 from IPython.kernel import multiengine as me
 from IPython.kernel import newserialized
 from IPython.kernel.error import NotDefined
-from IPython.testutils import util
-from IPython.testutils.parametric import parametric, Parametric
+from IPython.testing import util
+from IPython.testing.parametric import parametric, Parametric
 from IPython.kernel import newserialized
 from IPython.kernel.util import printer
 from IPython.kernel.error import (InvalidEngineID,

IPython/kernel/tests/test_controllerservice.py

@@ -27,7 +27,7 b' from twisted.application.service import IService'
 from IPython.kernel.controllerservice import ControllerService
 from IPython.kernel.tests import multienginetest as met
 from controllertest import IControllerCoreTestCase
-from IPython.testutils.util import DeferredTestCase
+from IPython.testing.util import DeferredTestCase
 
 class BasicControllerServiceTest(DeferredTestCase,
     IControllerCoreTestCase):

IPython/kernel/tests/test_enginefc.py

@@ -26,7 +26,7 b' import zope.interface as zi'
 
 from IPython.kernel.fcutil import Tub, UnauthenticatedTub
 from IPython.kernel import engineservice as es
-from IPython.testutils.util import DeferredTestCase
+from IPython.testing.util import DeferredTestCase
 from IPython.kernel.controllerservice import IControllerBase
 from IPython.kernel.enginefc import FCRemoteEngineRefFromService, IEngineBase
 from IPython.kernel.engineservice import IEngineQueued

IPython/kernel/tests/test_engineservice.py

@@ -27,7 +27,7 b' from twisted.internet import defer'
 from twisted.application.service import IService
 
 from IPython.kernel import engineservice as es
-from IPython.testutils.util import DeferredTestCase
+from IPython.testing.util import DeferredTestCase
 from IPython.kernel.tests.engineservicetest import \
     IEngineCoreTestCase, \
     IEngineSerializedTestCase, \

IPython/kernel/tests/test_multiengine.py

@@ -16,7 +16,7 b' __docformat__ = "restructuredtext en"'
 #-------------------------------------------------------------------------------
 
 from twisted.internet import defer
-from IPython.testutils.util import DeferredTestCase
+from IPython.testing.util import DeferredTestCase
 from IPython.kernel.controllerservice import ControllerService
 from IPython.kernel import multiengine as me
 from IPython.kernel.tests.multienginetest import (IMultiEngineTestCase,

IPython/kernel/tests/test_multienginefc.py

@@ -18,7 +18,7 b' from twisted.internet import defer, reactor'
 
 from IPython.kernel.fcutil import Tub, UnauthenticatedTub
 
-from IPython.testutils.util import DeferredTestCase
+from IPython.testing.util import DeferredTestCase
 from IPython.kernel.controllerservice import ControllerService
 from IPython.kernel.multiengine import IMultiEngine
 from IPython.kernel.tests.multienginetest import IFullSynchronousMultiEngineTestCase

IPython/kernel/tests/test_newserialized.py

@@ -17,7 +17,7 b' __docformat__ = "restructuredtext en"'
 
 import zope.interface as zi
 from twisted.trial import unittest
-from IPython.testutils.util import DeferredTestCase
+from IPython.testing.util import DeferredTestCase
 
 from IPython.kernel.newserialized import \
     ISerialized, \

IPython/kernel/tests/test_pendingdeferred.py

@@ -19,9 +19,9 b' __docformat__ = "restructuredtext en"'
 from twisted.internet import defer
 from twisted.python import failure
 
-from IPython.testutils import tcommon
-from IPython.testutils.tcommon import *
-from IPython.testutils.util import DeferredTestCase
+from IPython.testing import tcommon
+from IPython.testing.tcommon import *
+from IPython.testing.util import DeferredTestCase
 import IPython.kernel.pendingdeferred as pd
 from IPython.kernel import error
 from IPython.kernel.util import printer

IPython/kernel/tests/test_task.py

@@ -22,7 +22,7 b' from twisted.trial import unittest'
 
 from IPython.kernel import task, controllerservice as cs, engineservice as es
 from IPython.kernel.multiengine import IMultiEngine
-from IPython.testutils.util import DeferredTestCase
+from IPython.testing.util import DeferredTestCase
 from IPython.kernel.tests.tasktest import ITaskControllerTestCase
 
 #-------------------------------------------------------------------------------

IPython/kernel/tests/test_taskfc.py

@@ -23,7 +23,7 b' from IPython.kernel.fcutil import Tub, UnauthenticatedTub'
 from IPython.kernel import task as taskmodule
 from IPython.kernel import controllerservice as cs
 import IPython.kernel.multiengine as me
-from IPython.testutils.util import DeferredTestCase
+from IPython.testing.util import DeferredTestCase
 from IPython.kernel.multienginefc import IFCSynchronousMultiEngine
 from IPython.kernel.taskfc import IFCTaskController
 from IPython.kernel.util import printer

IPython/testing/tcommon.py

@@ -2,7 +2,7 b''
 
 This file is meant to be used as
 
-from IPython.testutils.tcommon import *
+from IPython.testing.tcommon import *
 
 by any test code.
 
@@ -32,5 +32,5 b' try:'
 except ImportError:
     pexpect = None
 else:
-    from IPython.testutils.ipdoctest import IPDocTestLoader,makeTestSuite
+    from IPython.testing.ipdoctest import IPDocTestLoader,makeTestSuite
     

IPython/testing/testTEMPLATE.py

@@ -25,8 +25,8 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-from IPython.testutils import tcommon
-from IPython.testutils.tcommon import *
+from IPython.testing import tcommon
+from IPython.testing.tcommon import *
 
 #-------------------------------------------------------------------------------
 # Setup for inline and standalone doctests

IPython/testing/tests/test_testutils.py

@@ -25,8 +25,8 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-from IPython.testutils import tcommon
-from IPython.testutils.tcommon import *
+from IPython.testing import tcommon
+from IPython.testing.tcommon import *
 
 #-------------------------------------------------------------------------------
 # Setup for inline and standalone doctests
@@ -43,7 +43,7 b' dt_files = fullPath(__file__,[])'
 # If you have any modules whose docstrings should be scanned for embedded tests
 # as examples accorging to standard doctest practice, set them here (as a
 # single string or a list thereof):
-dt_modules = ['IPython.testutils.tutils']
+dt_modules = ['IPython.testing.tutils']
 
 #-------------------------------------------------------------------------------
 # Regular Unittests

IPython/testing/tstTEMPLATE_doctest.py

@@ -11,6 +11,6 b' gets confused."""'
 
 # Setup - all imports are done in tcommon
 import tcommon; reload(tcommon)  # for interactive use
-from IPython.testutils.tcommon import *
+from IPython.testing.tcommon import *
 
 # Doctest code begins here

IPython/testing/tstTEMPLATE_doctest.txt

@@ -13,7 +13,7 b" test_toeplitz_doctest.py, which is run via IPython's irunner script to create"
 valid doctest input automatically.
 
 # Setup - all imports are done in tcommon
->>> from IPython.testutils.tcommon import *
+>>> from IPython.testing.tcommon import *
 
 # Rest of doctest goes here...
 

IPython/tools/tests/test_tools_utils.py

@@ -3,8 +3,8 b''
 """
 
 # Module imports
-from IPython.testutils import tcommon
-from IPython.testutils.tcommon import *
+from IPython.testing import tcommon
+from IPython.testing.tcommon import *
 
 # If you have standalone doctests in a separate file, set their names in the
 # dt_files variable (as a single string  or a list thereof).  The mkPath call

IPython/tools/tests/tst_tools_utils_doctest.py

@@ -1,6 +1,6 b''
 # Setup - all imports are done in tcommon
-from IPython.testutils import tcommon
-from IPython.testutils.tcommon import *
+from IPython.testing import tcommon
+from IPython.testing.tcommon import *
 
 # Doctest code begins here
 from IPython.tools import utils

IPython/tools/tests/tst_tools_utils_doctest.txt

@@ -13,8 +13,8 b' mkdoctests.py script for details.'
 Begin included file tst_tools_utils_doctest.py::
 
     # Setup - all imports are done in tcommon
-    >>> from IPython.testutils import tcommon
-    >>> from IPython.testutils.tcommon import *
+    >>> from IPython.testing import tcommon
+    >>> from IPython.testing.tcommon import *
     
     # Doctest code begins here
     >>> from IPython.tools import utils

IPython/tools/tests/tst_tools_utils_doctest2.py

@@ -1,6 +1,6 b''
 # Setup - all imports are done in tcommon
-from IPython.testutils import tcommon
-from IPython.testutils.tcommon import *
+from IPython.testing import tcommon
+from IPython.testing.tcommon import *
 
 # Doctest code begins here
 from IPython.tools import utils

IPython/tools/tests/tst_tools_utils_doctest2.txt

@@ -15,8 +15,8 b' Auto-generated tests'
 Begin included file tst_tools_utils_doctest2.py::
 
     # Setup - all imports are done in tcommon
-    >>> from IPython.testutils import tcommon
-    >>> from IPython.testutils.tcommon import *
+    >>> from IPython.testing import tcommon
+    >>> from IPython.testing.tcommon import *
     
     # Doctest code begins here
     >>> from IPython.tools import utils

setup.py

@@ -6,12 +6,16 b' Under Posix environments it works like a typical setup.py script.'
 Under Windows, the command sdist is not supported, since IPython 
 requires utilities which are not available under Windows."""
 
-#*****************************************************************************
-#       Copyright (C) 2001-2005 Fernando Perez <[e-mail]>
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
-#*****************************************************************************
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
 
 # Stdlib imports
 import os
@@ -24,35 +28,24 b' from glob import glob'
 if os.path.exists('MANIFEST'): os.remove('MANIFEST')
 
 from distutils.core import setup
-from setupext import install_data_ext
 
 # Local imports
 from IPython.genutils import target_update
 
-# A few handy globals
+from setupbase import (
+    setup_args, 
+    find_packages, 
+    find_package_data, 
+    find_scripts,
+    find_data_files,
+    check_for_dependencies
+)
+
 isfile = os.path.isfile
-pjoin = os.path.join
-
-##############################################################################
-# Utility functions
-def oscmd(s):
-    print ">", s
-    os.system(s)
-
-# A little utility we'll need below, since glob() does NOT allow you to do
-# exclusion on multiple endings!
-def file_doesnt_endwith(test,endings):
-    """Return true if test is a file and its name does NOT end with any
-    of the strings listed in endings."""
-    if not isfile(test):
-        return False
-    for e in endings:
-        if test.endswith(e):
-            return False
-    return True
-
-###############################################################################
-# Main code begins
+
+#-------------------------------------------------------------------------------
+# Handle OS specific things
+#-------------------------------------------------------------------------------
 
 if os.name == 'posix':
     os_name = 'posix'
@@ -69,6 +62,10 b" if os_name == 'windows' and 'sdist' in sys.argv:"
     print 'The sdist command is not available under Windows.  Exiting.'
     sys.exit(1)
 
+#-------------------------------------------------------------------------------
+# Things related to the IPython documentation
+#-------------------------------------------------------------------------------
+
 # update the manuals when building a source dist
 if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
     import textwrap
@@ -98,89 +95,68 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
 
     [ target_update(*t) for t in to_update ]
 
-# Release.py contains version, authors, license, url, keywords, etc.
-execfile(pjoin('IPython','Release.py'))
-
-# I can't find how to make distutils create a nested dir. structure, so
-# in the meantime do it manually. Butt ugly.
-# Note that http://www.redbrick.dcu.ie/~noel/distutils.html, ex. 2/3, contain
-# information on how to do this more cleanly once python 2.4 can be assumed.
-# Thanks to Noel for the tip.
-docdirbase  = 'share/doc/ipython'
-manpagebase = 'share/man/man1'
-
-# We only need to exclude from this things NOT already excluded in the
-# MANIFEST.in file.
-exclude     = ('.sh','.1.gz')
-docfiles    = filter(lambda f:file_doesnt_endwith(f,exclude),glob('doc/*'))
-examfiles   = filter(isfile, glob('doc/examples/*.py'))
-manfiles    = filter(isfile, glob('doc/manual/*'))
-manstatic   = filter(isfile, glob('doc/manual/_static/*'))
-manpages    = filter(isfile, glob('doc/*.1.gz'))
-
-cfgfiles    = filter(isfile, glob('IPython/UserConfig/*'))
-scriptfiles = filter(isfile, ['scripts/ipython','scripts/pycolor',
-                              'scripts/irunner'])
-
-igridhelpfiles = filter(isfile, glob('IPython/Extensions/igrid_help.*'))
-
-# Script to be run by the windows binary installer after the default setup
-# routine, to add shortcuts and similar windows-only things.  Windows
-# post-install scripts MUST reside in the scripts/ dir, otherwise distutils
-# doesn't find them.
-if 'bdist_wininst' in sys.argv:
-    if len(sys.argv) > 2 and ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
-        print >> sys.stderr,"ERROR: bdist_wininst must be run alone. Exiting."
-        sys.exit(1)
-    scriptfiles.append('scripts/ipython_win_post_install.py')
-
-datafiles = [('data', docdirbase, docfiles),
-             ('data', pjoin(docdirbase, 'examples'),examfiles),
-             ('data', pjoin(docdirbase, 'manual'),manfiles),
-             ('data', pjoin(docdirbase, 'manual/_static'),manstatic),
-             ('data', manpagebase, manpages),
-             ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
-             ]
+#---------------------------------------------------------------------------
+# Find all the packages, package data, scripts and data_files
+#---------------------------------------------------------------------------
+
+packages = find_packages()
+package_data = find_package_data()
+scripts = find_scripts()
+data_files = find_data_files()
+
+#---------------------------------------------------------------------------
+# Handle dependencies and setuptools specific things
+#---------------------------------------------------------------------------
+
+# This dict is used for passing extra arguments that are setuptools 
+# specific to setup
+setuptools_extra_args = {}
 
 if 'setuptools' in sys.modules:
-    # setuptools config for egg building
-    egg_extra_kwds = {
-        'entry_points': {
-            'console_scripts': [
+    setuptools_extra_args['zip_safe'] = False
+    setuptools_extra_args['entry_points'] = {
+        'console_scripts': [
             'ipython = IPython.ipapi:launch_new_instance',
-            'pycolor = IPython.PyColorize:main'
-            ]}
-        }
-    scriptfiles = []
+            'pycolor = IPython.PyColorize:main',
+            'ipcontroller = IPython.kernel.scripts.ipcontroller:main',
+            'ipengine = IPython.kernel.scripts.ipengine:main',
+            'ipcluster = IPython.kernel.scripts.ipcluster:main'
+        ]
+    }
+    setup_args["extras_require"] = dict(
+        kernel = [
+            "zope.interface>=3.4.1",
+            "Twisted>=8.0.1",
+            "foolscap>=0.2.6"        
+        ],
+        doc=['Sphinx>=0.3','pygments'],
+        test='nose>=0.10.1',
+        security=["pyOpenSSL>=0.6"]
+    )
+    # Allow setuptools to handle the scripts
+    scripts = []
     # eggs will lack docs, examples
-    datafiles = []
+    data_files = []
 else:
-    # Normal, non-setuptools install
-    egg_extra_kwds = {}
     # package_data of setuptools was introduced to distutils in 2.4
+    cfgfiles = filter(isfile, glob('IPython/UserConfig/*'))
     if sys.version_info < (2,4):
-        datafiles.append(('lib', 'IPython/UserConfig', cfgfiles))
-    
-# Call the setup() routine which does most of the work
-setup(name             = name,
-      version          = version,
-      description      = description,
-      long_description = long_description,
-      author           = authors['Fernando'][0],
-      author_email     = authors['Fernando'][1],
-      url              = url,
-      download_url     = download_url,
-      license          = license,
-      platforms        = platforms,
-      keywords         = keywords,
-      packages         = ['IPython', 'IPython.Extensions', 'IPython.external',
-                          'IPython.gui', 'IPython.gui.wx',
-                          'IPython.UserConfig'],
-      scripts          = scriptfiles,
-      package_data     = {'IPython.UserConfig' : ['*'] },
-      
-      cmdclass         = {'install_data': install_data_ext},
-      data_files       = datafiles,
-      # extra params needed for eggs
-      **egg_extra_kwds                        
-      )
+        data_files.append(('lib', 'IPython/UserConfig', cfgfiles))
+    # If we are running without setuptools, call this function which will
+    # check for dependencies an inform the user what is needed.  This is
+    # just to make life easy for users.
+    check_for_dependencies()
+
+
+#---------------------------------------------------------------------------
+# Do the actual setup now
+#---------------------------------------------------------------------------
+
+setup_args['packages'] = packages
+setup_args['package_data'] = package_data
+setup_args['scripts'] = scripts
+setup_args['data_files'] = data_files
+setup_args.update(setuptools_extra_args)
+
+if __name__ == '__main__':
+    setup(**setup_args)