Update release-related tools, make more py3k-friendly.

tools/release

@@ -1,52 +1,63 b''
 #!/usr/bin/env python
 """IPython release script.
 
-This should only be run at real release time.
+This should ONLY be run at real release time.
 """
+from __future__ import print_function
 
 from toollib import *
 
 # Get main ipython dir, this will raise if it doesn't pass some checks
 ipdir = get_ipdir()
 tooldir = pjoin(ipdir,'tools')
 distdir = pjoin(ipdir,'dist')
+
 # Where I keep static backups of each release
 ipbackupdir = os.path.expanduser('~/ipython/backup')
 
+# SSH root address of the archive site
+archive = '[e-mail]:archive.ipython.org'
 # Start in main IPython dir
 cd(ipdir)
 
 # Load release info
 execfile(pjoin('IPython','core','release.py'))
 
-print
-print "Releasing IPython"
-print "================="
-print
-print 'Source IPython directory:', ipdir
-print
+# Build site addresses for file uploads
+release_site = '%s/release/%s' % (archive, version)
+backup_site =  '%s/backup/%s' % (archive, version)
+
+# Start actual release process
+print()
+print('Releasing IPython')
+print('=================')
+print()
+print('Version:', version)
+print()
+print('Source IPython directory:', ipdir)
+print()
 
 # Perform local backup, go to tools dir to run it.
 cd(tooldir)
-c('./make_tarball.py')
-c('mv ipython-*.tgz %s' % ipbackupdir)
+sh('./make_tarball.py')
+sh('mv ipython-*.tgz %s' % ipbackupdir)
 
 # Build release files
-c('./build_release %s' % ipdir)
+sh('./build_release %s' % ipdir)
 
 # Register with the Python Package Index (PyPI)
-print "Registering with PyPI..."
+print( 'Registering with PyPI...')
 cd(ipdir)
-c('./setup.py register')
+sh('./setup.py register')
 
 # Upload all files
-c('./setup.py sdist --formats=gztar,zip upload')
+sh('./setup.py sdist --formats=gztar,zip upload')
 cd(distdir)
-print "Uploading distribution files..."
-c('scp * [e-mail]:www/dist/')
+print( 'Uploading distribution files...')
+sh('scp * %s' % release_site)
 
-print "Uploading backup files..."
+print( 'Uploading backup files...')
 cd(ipbackupdir)
-c('scp `ls -1tr *tgz | tail -1` [e-mail]:www/backup/')
+sh('scp `ls -1tr *tgz | tail -1` %s' % backup_site)
 
-print "Done!"
+print('Done!')

tools/toollib.py

@@ -1,48 +1,50 b''
 """Various utilities common to IPython release and maintenance tools.
 """
+from __future__ import print_function
+
 # 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 sh(cmd):
     """Run system command in shell, raise SystemExit if it returns an error."""
-    print "$",cmd
+    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."""
     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)