Factor build logic into function

tools/build_release

@@ -1,28 +1,32 b''
 #!/usr/bin/env python
 """IPython release build script.
 """
-
 import os
 from shutil import rmtree
 
-from toollib import sh, pjoin, get_ipdir, cd, compile_tree, execfile, sdists, wheels
+from toollib import sh, pjoin, get_ipdir, cd, compile_tree, execfile, sdists, buildwheels
+
+def build_release():
+
+    # Get main ipython dir, this will raise if it doesn't pass some checks
+    ipdir = get_ipdir()
+    cd(ipdir)
 
-# 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'), globals())
 
-# Load release info
-execfile(pjoin('IPython', 'core', 'release.py'), globals())
+    # Check that everything compiles
+    compile_tree('*')
 
-# 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):
+            rmtree(d)
 
-# Cleanup
-for d in ['build', 'dist', pjoin('docs', 'build'), pjoin('docs', 'dist'),
-          pjoin('docs', 'source', 'api', 'generated')]:
-    if os.path.isdir(d):
-        rmtree(d)
+    # Build source and binary distros
+    sh(sdists)
+    buildwheels()
 
-# Build source and binary distros
-sh(sdists)
-sh(wheels)
+if __name__ == '__main__':
+    build_release()

tools/release

@@ -1,88 +1,88 b''
 #!/usr/bin/env python
 """IPython release script.
 
 This should ONLY be run at real release time.
 """
 from __future__ import print_function
 
 import os
 import sys
 
 from toollib import (get_ipdir, pjoin, cd, execfile, sh, archive,
-        sdists, archive_user, archive_dir)
+        sdists, archive_user, archive_dir, buildwheels)
 from gh_api import post_download
 
 # 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')
 if not os.path.exists(ipbackupdir):
     os.makedirs(ipbackupdir)
 
 # Start in main IPython dir
 cd(ipdir)
 
 # Load release info
 version = None
 execfile(pjoin('IPython','core','release.py'), globals())
 
 # Build site addresses for file uploads
 release_site = '%s/release/%s' % (archive, version)
 backup_site =  '%s/backup/' % archive
 
 # 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)
 sh('./make_tarball.py')
 sh('mv ipython-*.tgz %s' % ipbackupdir)
 
 # Build release files
 sh('./build_release %s' % ipdir)
 
 # Not Registering with PyPI, registering with setup.py is insecure as communication is not encrypted
 cd(ipdir)
 
 # Upload all files
 sh(sdists)
-for py in ('2', '3'):
-    sh('python%s setupegg.py bdist_wheel' % py)
+
+buildwheels()
 
 if 'upload' not in sys.argv:
     print("`./release upload` to register and release")
     sys.exit(0)
 
 
 print('Will not upload with setuptools as upload connection is insecure. Please use `twine upload dist/*` to upload the files to PyPI')
 
 cd(distdir)
 print( 'Uploading distribution files to GitHub...')
 
 for fname in os.listdir('.'):
     # TODO: update to GitHub releases API
     continue
     print('uploading %s to GitHub' % fname)
     desc = "IPython %s source distribution" % version
     post_download("ipython/ipython", fname, description=desc)
 
 # Make target dir if it doesn't exist
 print('Uploading IPython to backup site.')
 sh('ssh %s "mkdir -p %s/release/%s" ' % (archive_user, archive_dir, version))
 sh('scp * %s' % release_site)
 
 print( 'Uploading backup files...')
 cd(ipbackupdir)
 sh('scp `ls -1tr *tgz | tail -1` %s' % backup_site)
 
 print('Done!')

tools/toollib.py

@@ -1,64 +1,66 b''
 """Various utilities common to IPython release and maintenance tools.
 """
 from __future__ import print_function
 
 # Library imports
 import os
 
 # Useful shorthands
 pjoin = os.path.join
 cd = os.chdir
 
 # Constants
 
 # SSH root address of the archive site
 archive_user = '[e-mail]'
 archive_dir = 'archive.ipython.org'
 archive = '%s:%s' % (archive_user, archive_dir)
 
 # Build commands
 # Source dists
 sdists = './setup.py sdist --formats=gztar,zip'
 # Binary dists
-wheels = './setupegg.py bdist_wheel'
+def buildwheels():
+    for py in ('2', '3'):
+        sh('python%s setupegg.py bdist_wheel' % py)
 
 # Utility functions
 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
     ipdir = pjoin(os.path.dirname(__file__), os.pardir)
 
     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(folder='.'):
     """Compile all Python files below current directory."""
     stat = os.system('python -m compileall {}'.format(folder))
     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)
 
 try:
     execfile
 except NameError:
     def execfile(fname, globs, locs=None):
         locs = locs or globs
         exec(compile(open(fname).read(), fname, "exec"), globs, locs)