Clean up version info tools and remove bzr references.

tools/build_release

@@ -1,35 +1,35 b''
 #!/usr/bin/env python
 """IPython release build script.
 """
 from toollib import *
 
 # Get main ipython dir, this will raise if it doesn't pass some checks
 ipdir = get_ipdir()
 cd(ipdir)
 
 # Load release info
 execfile(pjoin('IPython','core','release.py'))
 
 # Check that everything compiles
 compile_tree()
 
 # Cleanup
 for d in ['build','dist',pjoin('docs','build'),pjoin('docs','dist'),
           pjoin('docs','source','api','generated')]:
     if os.path.isdir(d):
         remove_tree(d)
 
 # Build source and binary distros
-c('./setup.py sdist --formats=gztar,zip')
+sh('./setup.py sdist --formats=gztar,zip')
 
 # Build eggs
-c('python2.6 ./setupegg.py bdist_egg')
+sh('python2.6 ./setupegg.py bdist_egg')
 
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for
 # bdist_wininst)
-c("python setup.py bdist_wininst --install-script=ipython_win_post_install.py")
+sh("python setup.py bdist_wininst --install-script=ipython_win_post_install.py")
 
 # Change name so retarded Vista runs the installer correctly
-c("rename 's/linux-i686/win32-setup/' dist/*.exe")
-c("rename 's/linux-x86_64/win32-setup/' dist/*.exe")
+sh("rename 's/linux-i686/win32-setup/' dist/*.exe")
+sh("rename 's/linux-x86_64/win32-setup/' dist/*.exe")

tools/make_tarball.py

@@ -1,25 +1,25 b''
 #!/usr/bin/env python
 """Simple script to create a tarball with proper git info.
 """
 
 import commands
 import os
 import sys
 import shutil
 
 from  toollib import *
 
 tag = commands.getoutput('git describe')
 base_name = 'ipython-%s' % tag
 tar_name = '%s.tgz' % base_name
 
 # git archive is weird:  Even if I give it a specific path, it still won't
 # archive the whole tree.  It seems the only way to get the whole tree is to cd
 # to the top of the tree.  There are long threads (since 2007) on the git list
 # about this and it still doesn't work in a sensible way...
 
 start_dir = os.getcwd()
 cd('..')
 git_tpl = 'git archive --format=tar --prefix={0}/ HEAD | gzip > {1}'
-c(git_tpl.format(base_name, tar_name))
-c('mv {0} tools/'.format(tar_name))
+sh(git_tpl.format(base_name, tar_name))
+sh('mv {0} tools/'.format(tar_name))

tools/toollib.py

@@ -1,55 +1,48 b''
 """Various utilities common to IPython release and maintenance tools.
 """
 # Library imports
 import os
 import sys
 
 from distutils.dir_util import remove_tree
 
 # Useful shorthands
 pjoin = os.path.join
 cd = os.chdir
 
 # Utility functions
-def c(cmd):
-    """Run system command, raise SystemExit if it returns an error."""
+def sh(cmd):
+    """Run system command in shell, raise SystemExit if it returns an error."""
     print "$",cmd
     stat = os.system(cmd)
     #stat = 0  # Uncomment this and comment previous to run in debug mode
     if stat:
         raise SystemExit("Command %s failed with code: %s" % (cmd, stat))
 
+# Backwards compatibility
+c = sh
 
 def get_ipdir():
     """Get IPython directory from command line, or assume it's the one above."""
 
     # Initialize arguments and check location
     try:
         ipdir = sys.argv[1]
     except IndexError:
         ipdir = '..'
 
     ipdir = os.path.abspath(ipdir)
 
     cd(ipdir)
     if not os.path.isdir('IPython') and os.path.isfile('setup.py'):
         raise SystemExit('Invalid ipython directory: %s' % ipdir)
     return ipdir
 
 
 def compile_tree():
     """Compile all Python files below current directory."""
-    vstr = '.'.join(map(str,sys.version_info[:2]))
-    stat = os.system('python %s/lib/python%s/compileall.py .' %
-                     (sys.prefix,vstr))
+    stat = os.system('python -m compileall .')
     if stat:
         msg = '*** ERROR: Some Python files in tree do NOT compile! ***\n'
         msg += 'See messages above for the actual file that produced it.\n'
         raise SystemExit(msg)
-
-
-def version_info():
-    """Return bzr version info as a dict."""
-    out = os.popen('bzr version-info')
-    pairs = (l.split(':',1) for l in out)
-    return dict(((k,v.strip()) for (k,v) in pairs))