Removed ipapi compatability layer and updated top-level functions.

The ipapi.py module has been completely deprecated as of this point.
No new code should use it and all existing code that uses it will
migrate away from it.  The launch_new_instance function has
been moved to ipapp and the setup.py scripts have been updated.

IPython/core/ipapi.py

@@ -1,19 +1,10 b''
 #!/usr/bin/env python
 # encoding: utf-8
 """
-Oh my @#*%, where did ipapi go?
-
-Originally, this module was designed to be a public api for IPython.  It is
-now deprecated and replaced by :class:`IPython.core.Interactive` shell.
-Almost all of the methods that were here are now there, but possibly renamed.
-
-During our transition, we will keep this simple module with its :func:`get`
-function.  It too will eventually go away when the new component querying
-interface is fully used.
-
-Authors:
-
-* Brian Granger
+This module is *completely* deprecated and should no longer be used for
+any purpose.  Currently, we have a few parts of the core that have
+not been componentized and thus, still rely on this module.  When everything
+has been made into a component, this module will be sent to deathrow.
 """
 
 #-----------------------------------------------------------------------------
@@ -42,17 +33,3 b' def get():'
         if inst.created > most_recent.created:
             most_recent = inst
     return most_recent
-
-def launch_new_instance():
-    """Create a run a full blown IPython instance"""
-    from IPython.core.ipapp import IPythonApp
-    app = IPythonApp()
-    app.start()
-
-
-
-
-
-
-
-

IPython/core/ipapp.py

@@ -538,6 +538,8 b' def load_default_config(ipythondir=None):'
     return config
 
 
-if __name__ == '__main__':
+def launch_new_instance():
+    """Create a run a full blown IPython instance"""
     app = IPythonApp()
-    app.start()
  No newline at end of file
+    app.start()
+

IPython/scripts/ipython

@@ -1,28 +1,6 b''
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-"""IPython -- An enhanced Interactive Python
 
-This is just the startup wrapper script, kept deliberately to a minimum.
-
-The shell's mainloop() takes an optional argument, sys_exit (default=0). If
-set to 1, it calls sys.exit() at exit time. You can use the following code in
-your PYTHONSTARTUP file:
-
-import IPython
-IPython.Shell.IPShell().mainloop(sys_exit=1)
-
-[or simply IPython.Shell.IPShell().mainloop(1) ]
-
-and IPython will be your working environment when you start python. The final
-sys.exit() call will make python exit transparently when IPython finishes, so
-you don't have an extra prompt to get out of.
-
-This is probably useful to developers who manage multiple Python versions and
-don't want to have correspondingly multiple IPython versions. Note that in
-this mode, there is no way to pass IPython any command-line options, as those
-are trapped first by Python itself.
-"""
-
-from IPython.core.ipapi import launch_new_instance
+from IPython.core.ipapp import launch_new_instance
 
 launch_new_instance()

MANIFEST.in

@@ -18,7 +18,6 b' graft IPython/scripts'
 graft IPython/testing
 graft IPython/utils
 
-recursive-include IPython/extensions igrid_help*
 
 graft docs
 exclude docs/\#*

setup.py

@@ -167,7 +167,7 b" if 'setuptools' in sys.modules:"
     setuptools_extra_args['zip_safe'] = False
     setuptools_extra_args['entry_points'] = {
         'console_scripts': [
-            'ipython = IPython.core.ipapi:launch_new_instance',
+            'ipython = IPython.core.ipapp:launch_new_instance',
             'pycolor = IPython.utils.PyColorize:main',
             'ipcontroller = IPython.kernel.scripts.ipcontroller:main',
             'ipengine = IPython.kernel.scripts.ipengine:main',
@@ -190,10 +190,6 b" if 'setuptools' in sys.modules:"
     # Allow setuptools to handle the scripts
     scripts = []
 else:
-    # package_data of setuptools was introduced to distutils in 2.4
-    cfgfiles = filter(isfile, glob(pjoin('IPython','config','userconfig')))
-    if sys.version_info < (2,4):
-        data_files.append(('lib', pjoin('IPython','config','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.

setupbase.py

@@ -103,7 +103,7 b' def find_packages():'
     Find all of IPython's packages.
     """
     packages = ['IPython']
-    add_package(packages, 'config', tests=True)
+    add_package(packages, 'config', tests=True, others=['default','profile'])
     add_package(packages, 'core', tests=True)
     add_package(packages, 'deathrow', tests=True)
     add_package(packages , 'extensions')