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.
This commit is contained in:
Brian Granger 2009-09-17 19:59:36 -07:00
parent cf5972e4aa
commit 81e0e8805d
2 changed files with 2 additions and 6 deletions

View File

@ -167,7 +167,7 @@ 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 @@ 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.

View File

@ -103,7 +103,7 @@ 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')