Small fixes so release builds.

docs/autogen_api.py

@@ -1,34 +1,35 b''
 #!/usr/bin/env python
 """Script to auto-generate our API docs.
 """
 # stdlib imports
 import os
 import sys
 
 # local imports
 sys.path.append(os.path.abspath('sphinxext'))
 from apigen import ApiDocWriter
 
 #*****************************************************************************
 if __name__ == '__main__':
     pjoin = os.path.join
     package = 'IPython'
     outdir = pjoin('source','api','generated')
     docwriter = ApiDocWriter(package,rst_extension='.txt')
     docwriter.package_skip_patterns += [r'\.fixes$',
                                         r'\.externals$',
                                         r'\.Extensions',
                                         r'\.kernel.config',
                                         r'\.attic',
                                         ]
     docwriter.module_skip_patterns += [ r'\.FakeModule',
+                                        r'\.gui.wx.wxIPython',
                                         r'\.cocoa',
                                         r'\.ipdoctest',
                                         r'\.Gnuplot',
                                         r'\.frontend.process.winprocess',
                                         ]
     docwriter.write_api_docs(outdir)
     docwriter.write_index(outdir, 'gen',
                           relative_to = pjoin('source','api')
                           )
     print '%d files written' % len(docwriter.written_modules)

setupegg.py

@@ -1,13 +1,18 b''
 #!/usr/bin/env python
 """Wrapper to run setup.py using setuptools."""
 
 import os
+import shutil
 import sys
 
 # now, import setuptools and call the actual setup
 import setuptools
 execfile('setup.py')
 
 # clean up the junk left around by setuptools
 if "develop" not in sys.argv:
-    os.unlink('ipython.egg-info')
+    egg_info = 'ipython.egg-info'
+    if os.path.isdir(egg_info):
+        shutil.rmtree(egg_info)
+    else:
+        os.unlink(egg_info)

setupext/setupext.py

@@ -1,178 +1,177 b''
 # encoding: utf-8
 
 __docformat__ = "restructuredtext en"
 
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
 import sys, os
 from textwrap import fill
 
 display_status=True
 
 if display_status:
     def print_line(char='='):
         print char * 76
 
     def print_status(package, status):
         initial_indent = "%22s: " % package
         indent = ' ' * 24
         print fill(str(status), width=76,
                    initial_indent=initial_indent,
                    subsequent_indent=indent)
 
     def print_message(message):
         indent = ' ' * 24 + "* "
         print fill(str(message), width=76,
                    initial_indent=indent,
                    subsequent_indent=indent)
 
     def print_raw(section):
         print section
 else:
     def print_line(*args, **kwargs):
         pass
     print_status = print_message = print_raw = print_line
 
 #-------------------------------------------------------------------------------
 # Tests for specific packages
 #-------------------------------------------------------------------------------
 
 def check_for_ipython():
     try:
         import IPython
     except ImportError:
         print_status("IPython", "Not found")
         return False
     else:
         print_status("IPython", IPython.__version__)
         return True
 
 def check_for_zopeinterface():
     try:
         import zope.interface
     except ImportError:
         print_status("zope.Interface", "Not found (required for parallel computing capabilities)")
         return False
     else:
         print_status("Zope.Interface","yes")
         return True
         
 def check_for_twisted():
     try:
         import twisted
     except ImportError:
         print_status("Twisted", "Not found (required for parallel computing capabilities)")
         return False
     else:
         major = twisted.version.major
         minor = twisted.version.minor
         micro = twisted.version.micro
         print_status("Twisted", twisted.version.short())
         if not ((major==2 and minor>=5 and micro>=0) or \
                 major>=8):
             print_message("WARNING: IPython requires Twisted 2.5.0 or greater, you have version %s"%twisted.version.short())
             print_message("Twisted is required for parallel computing capabilities")
             return False
         else:
             return True
 
 def check_for_foolscap():
     try:
         import foolscap
     except ImportError:
         print_status('Foolscap', "Not found (required for parallel computing capabilities)")
         return False
     else:
         print_status('Foolscap', foolscap.__version__)
         return True
 
 def check_for_pyopenssl():
     try:
         import OpenSSL
     except ImportError:
         print_status('OpenSSL', "Not found (required if you want security in the parallel computing capabilities)")
         return False
     else:
         print_status('OpenSSL', OpenSSL.__version__)    
         return True
 
 def check_for_sphinx():
     try:
         import sphinx
     except ImportError:
         print_status('sphinx', "Not found (required for building documentation)")
         return False
     else:
         print_status('sphinx', sphinx.__version__) 
         return True
 
 def check_for_pygments():
     try:
         import pygments
     except ImportError:
         print_status('pygments', "Not found (required for syntax highlighting documentation)")
         return False
     else:
         print_status('pygments', pygments.__version__)
         return True
 
 def check_for_nose():
     try:
         import nose
     except ImportError:
         print_status('nose', "Not found (required for running the test suite)")
         return False
     else:
         print_status('nose', nose.__version__)
         return True
 
 def check_for_pexpect():
     try:
         import pexpect
     except ImportError:
         print_status("pexpect", "no (required for running standalone doctests)")
         return False
     else:
         print_status("pexpect", pexpect.__version__)
         return True
 
 def check_for_httplib2():
     try:
         import httplib2
     except ImportError:
         print_status("httplib2", "no (required for blocking http clients)")
         return False
     else:
         print_status("httplib2","yes")
         return True
 
 def check_for_sqlalchemy():
     try:
         import sqlalchemy
     except ImportError:
         print_status("sqlalchemy", "no (required for the ipython1 notebook)")
         return False
     else:
         print_status("sqlalchemy","yes")
         return True
 
 def check_for_simplejson():
     try:
         import simplejson
     except ImportError:
         print_status("simplejson", "no (required for the ipython1 notebook)")
         return False
     else:
         print_status("simplejson","yes")
         return True
 
-        
  No newline at end of file

tools/build_release

@@ -1,34 +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','Release.py'))
 
 # Check that everything compiles
 compile_tree()
 
 # Cleanup
 for d in ['build','dist',pjoin('docs','build'),pjoin('docs','dist')]:
     if os.path.isdir(d):
         remove_tree(d)
 
 # Build source and binary distros
 c('./setup.py sdist --formats=gztar,zip')
 
 # Build eggs
 c('python2.5 ./setupegg.py bdist_egg')
 c('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")
 
 # 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")