ipykit improvements (built in Sc1 setup etc.)

IPython/Extensions/ipy_kitcfg.py

@@ -1,56 +1,80 b''
 import os,sys
 
 import ipy_rehashdir,glob
 from ipy_rehashdir import selflaunch, PyLauncher
 
 def pylaunchers():
     """Create launchers for python scripts in cwd and store them in alias table
     
     This is useful if you want to invoke .py scripts from ipykit session,
     just adding .py files in PATH does not work without file association.
     
     .ipy files will be run like macros.
     
     """
     fs = glob.glob('*.?py*')
     for f in fs:
         l = PyLauncher(f)
         n = os.path.splitext(f)[0]
         ip.defalias(n, l)
         ip.magic('store '+n)
 
 
 def exta_imports():
     # add some modules that you'd want to be bundled in the ipykit
     # library zip file here. Do this if you get ImportErrors from scripts you
     # try to launch with 'py' or pylaunchers. In theory you could include
     # the whole stdlib here for full script coverage
     
     # note that this is never run, it's just here for py2exe
     import distutils.dir_util
   
+def kitroot():
+    return os.environ.get('IPYKITROOT', None)
+    
 def main():
-    root = os.environ.get('IPYKITROOT', None)
-    if not root:
+
+    if not kitroot():
         print "Can't configure ipykit, IPYKITROOT should be set."
         return
-    
-    os.environ["PATH"] = os.environ["PATH"] + ";" + root + "\\bin;"
+        
+    os.environ["PATH"] = os.environ["PATH"] + ";" + kitroot() + "\\bin;"
     ip.to_user_ns("pylaunchers")
+    cmds = ip.db.get('syscmdlist', None)
+    if cmds is None:
+        ip.magic('rehashx')
+        cmds = ip.db.get('syscmdlist', [])
+    #print cmds
+    if 'sc1' in cmds:
+        print "Default editor: Sc1"
+        import ipy_editors
+        ipy_editors.scite('sc1')
     
+    # for icp, imv, imkdir, etc.
+    import ipy_fsops
+
+greeting = """\n\n === Welcome to ipykit ===
+
+%quickref - learn quickly about IPython.
+
+"""
     
 def ipython_firstrun(ip):
+
     print "First run of ipykit - configuring"
+
     ip.defalias('py',selflaunch)
-    ip.defalias('d','ls -F')
-    ip.defalias('ls','ls')
+    ip.defalias('d','dir /w /og /on')
     ip.magic('store py')
     ip.magic('store d')
-    ip.magic('store ls')
+    
+    bins = kitroot() +'/bin'
 
+    print greeting
+        
 def init_ipython(ipy):
     global ip
     ip = ipy
     main()
 
 

exesetup.py

@@ -1,105 +1,106 b''
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 r"""Setup script for exe distribution of IPython (does not require python).
 
 - Requires py2exe
 
 - install pyreadline *package dir* in ipython root directory by running:
   
 svn co http://ipython.scipy.org/svn/ipython/pyreadline/branches/maintenance_1.3/pyreadline/  
 wget http://ipython.scipy.org/svn/ipython/pyreadline/branches/maintenance_1.3/readline.py
 
 OR (if you want the latest trunk):  
   
 svn co http://ipython.scipy.org/svn/ipython/pyreadline/trunk/pyreadline
 
 - Create the distribution in 'dist' by running "python exesetup.py py2exe"
 
 - Run ipython.exe to go.
 
 """
 
 #*****************************************************************************
 #       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.
 #*****************************************************************************
 
 # Stdlib imports
 import os
 import sys
 
 from glob import glob
 
 
 # A few handy globals
 isfile = os.path.isfile
 pjoin = os.path.join
 
 from distutils.core import setup
 from distutils import dir_util
 import py2exe
 
 # update the manuals when building a source dist
 # Release.py contains version, authors, license, url, keywords, etc.
 execfile(pjoin('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
 
 
 egg_extra_kwds = {}
 
 # Call the setup() routine which does most of the work
 setup(name             = name,
     options   = {
     'py2exe': {
         'packages' : ['IPython', 'IPython.Extensions', 'IPython.external',
                       'pyreadline'],
         'excludes' : ["Tkconstants","Tkinter","tcl",'IPython.igrid','wx',
                       'wxPython','igrid', 'PyQt4', 'zope', 'Zope', 'Zope2',
-                      '_curses','enthought.traits','gtk','qt']
+                      '_curses','enthought.traits','gtk','qt', 'pydb','idlelib',                      
+                      ]
                     
                      }
     },
     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,
     console          = ['ipykit.py'],
     
     # extra params needed for eggs
     **egg_extra_kwds                        
     )
 
 minimal_conf = """
 import IPython.ipapi
 ip = IPython.ipapi.get()
-import ipy_profile_sh
-ip.load('ipy_kitcfg')
 
+ip.load('ipy_kitcfg')
+import ipy_profile_sh
 """
 
 if not os.path.isdir("dist/_ipython"):
     print "Creating simple _ipython dir"
     os.mkdir("dist/_ipython")
     open("dist/_ipython/ipythonrc.ini","w").write("# intentionally blank\n")
     open("dist/_ipython/ipy_user_conf.py","w").write(minimal_conf)
     if os.path.isdir('bin'):
-        dir_util.copy_tree('bin','dist/_ipython/bin')
+        dir_util.copy_tree('bin','dist/bin')

tools/mkrel.py

@@ -1,31 +1,39 b''
 """ Create ipykit and exe installer
 
 requires py2exe
 
 """
 #!/bin/sh
 # IPython release script
 
 
 import os
 import distutils.dir_util
+import sys
+
+execfile('../IPython/Release.py')
+
 def c(cmd):
     print ">",cmd
     os.system(cmd)
 
+ipykit_name = "ipykit-%s" % version
+
+
 os.chdir('..')
 if os.path.isdir('dist'):
     distutils.dir_util.remove_tree('dist')
-if os.path.isdir('ipykit'):
-    distutils.dir_util.remove_tree('ipykit')
+if os.path.isdir(ipykit_name):
+    distutils.dir_util.remove_tree(ipykit_name)
 
 c("python exesetup.py py2exe")
-os.rename('dist','ipykit')
 
-c("zip -r ipykit.zip ipykit")
+os.rename('dist',ipykit_name)
+
+c("zip -r %s.zip %s" % (ipykit_name, ipykit_name))
 
 c("python setup.py bdist_wininst --install-script=ipython_win_post_install.py")
 
 os.chdir("dist")
-c("svn export http://ipython.scipy.org/svn/ipython/ipython/trunk ipython")
-c("zip -r ipython_svn.zip ipython")
+#c("svn export http://ipython.scipy.org/svn/ipython/ipython/trunk ipython")
+#c("zip -r ipython_svn.zip ipython")