diff --git a/docs/autogen_api.py b/docs/autogen_api.py index c7c54de..ffe8fab 100755 --- a/docs/autogen_api.py +++ b/docs/autogen_api.py @@ -22,6 +22,7 @@ if __name__ == '__main__': r'\.attic', ] docwriter.module_skip_patterns += [ r'\.FakeModule', + r'\.gui.wx.wxIPython', r'\.cocoa', r'\.ipdoctest', r'\.Gnuplot', diff --git a/setupegg.py b/setupegg.py index beeab3d..a65e936 100755 --- a/setupegg.py +++ b/setupegg.py @@ -2,6 +2,7 @@ """Wrapper to run setup.py using setuptools.""" import os +import shutil import sys # now, import setuptools and call the actual setup @@ -10,4 +11,8 @@ 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) diff --git a/setupext/setupext.py b/setupext/setupext.py index e7b743b..8cfcd33 100644 --- a/setupext/setupext.py +++ b/setupext/setupext.py @@ -175,4 +175,3 @@ def check_for_simplejson(): print_status("simplejson","yes") return True - \ No newline at end of file diff --git a/tools/build_release b/tools/build_release index 041ca99..ba2e0c1 100755 --- a/tools/build_release +++ b/tools/build_release @@ -32,3 +32,4 @@ 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")