Separate eggsetup.py that handles scripts installation in the egg

way (exe on windows, extensionless python script on posix)

ChangeLog update

eggsetup.py

@@ -0,0 +1,158 b''
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""Setup script for IPython.
+
+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]>
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#*****************************************************************************
+
+import sys, os
+from glob import glob
+from setupext import install_data_ext
+isfile = os.path.isfile
+
+# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
+# update it when the contents of directories change.
+if os.path.exists('MANIFEST'): os.remove('MANIFEST')
+
+if os.name == 'posix':
+    os_name = 'posix'
+elif os.name in ['nt','dos']:
+    os_name = 'windows'
+else:
+    print 'Unsupported operating system:',os.name
+    sys.exit(1)
+
+# Under Windows, 'sdist' is not supported, since it requires lyxport (and
+# hence lyx,perl,latex,pdflatex,latex2html,sh,...)
+if os_name == 'windows' and sys.argv[1] == 'sdist':
+    print 'The sdist command is not available under Windows.  Exiting.'
+    sys.exit(1)
+
+#from distutils.core import setup
+from setuptools import setup
+
+# update the manuals when building a source dist
+if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
+    from IPython.genutils import target_update
+    # list of things to be updated. Each entry is a triplet of args for
+    # target_update()
+    to_update = [('doc/magic.tex',
+                  ['IPython/Magic.py'],
+                  "cd doc && ./update_magic.sh" ),
+                 
+                 ('doc/manual.lyx',
+                  ['IPython/Release.py','doc/manual_base.lyx'],
+                  "cd doc && ./update_version.sh" ),
+                 
+                 ('doc/manual/manual.html',
+                  ['doc/manual.lyx',
+                   'doc/magic.tex',
+                   'doc/examples/example-gnuplot.py',
+                   'doc/examples/example-magic.py',
+                   'doc/examples/example-embed.py',
+                   'doc/examples/example-embed-short.py',
+                   'IPython/UserConfig/ipythonrc',
+                   ],
+                  "cd doc && "
+                  "lyxport -tt --leave --pdf "
+                  "--html -o '-noinfo -split +1 -local_icons' manual.lyx"),
+                 
+                 ('doc/new_design.pdf',
+                  ['doc/new_design.lyx'],
+                  "cd doc && lyxport -tt --pdf new_design.lyx"),
+
+                 ('doc/ipython.1.gz',
+                  ['doc/ipython.1'],
+                  "cd doc && gzip -9c ipython.1 > ipython.1.gz"),
+
+                 ('doc/pycolor.1.gz',
+                  ['doc/pycolor.1'],
+                  "cd doc && gzip -9c pycolor.1 > pycolor.1.gz"),
+                 ]
+    for target in to_update:
+        target_update(*target)
+
+# Release.py contains version, authors, license, url, keywords, etc.
+execfile(os.path.join('IPython','Release.py'))
+
+# 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
+
+# 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-%s' % version
+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/*.html')) + \
+              filter(isfile, glob('doc/manual/*.css')) + \
+              filter(isfile, glob('doc/manual/*.png'))
+manpages    = filter(isfile, glob('doc/*.1.gz'))
+cfgfiles    = filter(isfile, glob('IPython/UserConfig/*'))
+scriptfiles = filter(isfile, ['scripts/ipython','scripts/pycolor'])
+
+# 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')
+
+# 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'],
+      #scripts          = scriptfiles,
+      cmdclass         = {'install_data': install_data_ext},
+      data_files       = [('data', docdirbase, docfiles),
+                          ('data', os.path.join(docdirbase, 'examples'),
+                           examfiles),
+                          ('data', os.path.join(docdirbase, 'manual'),
+                           manfiles),
+                          ('data', manpagebase, manpages),
+                          ('lib', 'IPython/UserConfig', cfgfiles)],
+        # egg options
+        entry_points = {
+            'console_scripts': [
+                'ipython = IPython.ipapi:launch_new_instance',
+                'pycolor = IPython.PyColorize:main'
+            ],
+        }                          
+      )

IPython/ipapi.py

@@ -1,143 +1,157 b''
 ''' IPython customization API
 
 Your one-stop module for configuring & extending ipython
 
 The API will probably break when ipython 1.0 is released, but so 
 will the other configuration method (rc files).
 
 All names prefixed by underscores are for internal use, not part 
 of the public api.
 
 Below is an example that you can just put to a module and import from ipython. 
 
 A good practice is to install the config script below as e.g. 
 
 ~/.ipython/my_private_conf.py
 
 And do 
 
 import_mod my_private_conf 
 
 in ~/.ipython/ipythonrc
 
 That way the module is imported at startup and you can have all your
 personal configuration (as opposed to boilerplate ipythonrc-PROFILENAME 
 stuff) in there. 
 
 -----------------------------------------------
 import IPython.ipapi as ip
 
 def ankka_f(self, arg):
     print "Ankka",self,"says uppercase:",arg.upper()
 
 ip.expose_magic("ankka",ankka_f)
 
 ip.magic('alias sayhi echo "Testing, hi ok"')
 ip.magic('alias helloworld echo "Hello world"')
 ip.system('pwd')
 
 ip.ex('import re')
 ip.ex("""
 def funcci(a,b):
     print a+b
 print funcci(3,4)
 """)
 ip.ex("funcci(348,9)")
 
 def jed_editor(self,filename, linenum=None):
     print "Calling my own editor, jed ... via hook!"
     import os
     if linenum is None: linenum = 0
     os.system('jed +%d %s' % (linenum, filename))
     print "exiting jed"
 
 ip.set_hook('editor',jed_editor)
 
 o = ip.options()
 o.autocall = 2  # FULL autocall mode
 
 print "done!"
     
 '''
  
 def _init_with_shell(ip):
     global magic
     magic = ip.ipmagic
     global system
     system = ip.ipsystem
     global set_hook
     set_hook = ip.set_hook
     
     global __IP
     __IP = ip
 
 def options():
     """ All configurable variables """
     return __IP.rc
 
 def user_ns():
     return __IP.user_ns
 
 def expose_magic(magicname, func):
     ''' Expose own function as magic function for ipython 
 
     def foo_impl(self,parameter_s=''):
         """My very own magic!. (Use docstrings, IPython reads them)."""
         print 'Magic function. Passed parameter is between < >: <'+parameter_s+'>'
         print 'The self object is:',self
 
     ipapi.expose_magic("foo",foo_impl)
     '''
     
     from IPython import Magic
     import new
     im = new.instancemethod(func,__IP, __IP.__class__)
     setattr(__IP, "magic_" + magicname, im)
 
 class asmagic:
     """ Decorator for exposing magics in a friendly 2.4 decorator form 
     
     @ip.asmagic("foo")
     def f(self,arg):
         pring "arg given:",arg
     
     After this, %foo is a magic function.
     """
     
     def __init__(self,magicname):
         self.name = magicname
         
     def __call__(self,f):
         expose_magic(self.name, f)
         return f
 
 class ashook:
     """ Decorator for exposing magics in a friendly 2.4 decorator form 
     
     @ip.ashook("editor")
     def jed_editor(self,filename, linenum=None):
         import os
         if linenum is None: linenum = 0
         os.system('jed +%d %s' % (linenum, filename))
     
     """
     
     def __init__(self,name,priority=50):
         self.name = name
         self.prio = priority
         
     def __call__(self,f):
         set_hook(self.name, f, self.prio)
         return f
 
 
 def ex(cmd):
     """ Execute a normal python statement in user namespace """
     exec cmd in user_ns()
 
 def ev(expr):
     """ Evaluate python expression expr in user namespace 
     
     Returns the result """
     return eval(expr,user_ns())
+
+def launch_new_instance():
+    """ Creata and start a new ipython instance.
+    
+    This can be called even without having an already initialized 
+    ipython session running.
+    
+    """
+    import IPython
+
+    IPython.Shell.start().mainloop()
+    
+    
+    
     
  No newline at end of file