Merge pull request #9192 from Carreau/release-tools-2

Release tools 2

IPython/core/release.py

@@ -105,12 +105,10 b" author_email = '[e-mail]'"
 
 url = 'http://ipython.org'
 
-download_url = 'https://github.com/ipython/ipython/downloads'
 
-platforms = ['Linux','Mac OSX','Windows XP/Vista/7/8']
+platforms = ['Linux','Mac OSX','Windows']
 
-keywords = ['Interactive','Interpreter','Shell','Parallel','Distributed',
-            'Web-based computing', 'Qt console', 'Embedding']
+keywords = ['Interactive','Interpreter','Shell', 'Embedding']
 
 classifiers = [
     'Framework :: IPython',

setupbase.py

@@ -80,7 +80,6 b' setup_args = dict('
       author           = author,
       author_email     = author_email,
       url              = url,
-      download_url     = download_url,
       license          = license,
       platforms        = platforms,
       keywords         = keywords,

tools/build_release

@@ -15,7 +15,7 b' cd(ipdir)'
 execfile(pjoin('IPython', 'core', 'release.py'), globals())
 
 # Check that everything compiles
-compile_tree()
+compile_tree('*')
 
 # Cleanup
 for d in ['build', 'dist', pjoin('docs', 'build'), pjoin('docs', 'dist'),

tools/release

@@ -8,7 +8,7 b' from __future__ import print_function'
 import os
 import sys
 
-from toollib import (get_ipdir, pjoin, cd, execfile, version, sh, archive,
+from toollib import (get_ipdir, pjoin, cd, execfile, sh, archive,
         sdists, archive_user, archive_dir)
 from gh_api import post_download
 
@@ -26,6 +26,7 b' if not os.path.exists(ipbackupdir):'
 cd(ipdir)
 
 # Load release info
+version = None
 execfile(pjoin('IPython','core','release.py'), globals())
 
 # Build site addresses for file uploads
@@ -50,18 +51,19 b" sh('mv ipython-*.tgz %s' % ipbackupdir)"
 # Build release files
 sh('./build_release %s' % ipdir)
 
-if 'upload' not in sys.argv:
-    print("`./release upload` to register and release")
-    sys.exit(0)
-
 # 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.7', '3.4'):
+for py in ('2', '3'):
     sh('python%s setupegg.py bdist_wheel' % py)
 
+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)

tools/toollib.py

@@ -48,9 +48,9 b' def get_ipdir():'
     return ipdir
 
 
-def compile_tree():
+def compile_tree(folder='.'):
     """Compile all Python files below current directory."""
-    stat = os.system('python -m compileall .')
+    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'