mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-18 11:55:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Windows install fixes

Browse Source 
* Make Start menu item include Python version and bit-ness (prevents clobbering)
* don't ask setuptools to install pyreadline on 64b Windows, due to pyreadline bug #787574
This commit is contained in:
Christoph Gohlke 2011-07-04 13:21:06 -07:00 committed by MinRK
parent 821c9609c0
commit ec560ae17b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup.py
View File

@ -230,7 +230,9 @@ if 'setuptools' in sys.modules:
if not setupext.check_for_readline():
if sys.platform == 'darwin':
requires.append('readline')
elif sys.platform.startswith('win'):
elif sys.platform.startswith('win') and sys.maxsize < 2**32:
# only require pyreadline on 32b Windows, due to 64b bug in pyreadline:
# https://bugs.launchpad.net/pyreadline/+bug/787574
requires.append('pyreadline')
else:
pass
@ -246,6 +248,7 @@ if 'setuptools' in sys.modules:
print >> sys.stderr, "ERROR: bdist_wininst must be run alone. Exiting."
sys.exit(1)
setup_args['scripts'] = [pjoin('scripts','ipython_win_post_install.py')]
setup_args['options'] = {"bdist_wininst": {"install_script": "ipython_win_post_install.py"}}
else:
# If we are running without setuptools, call this function which will
# check for dependencies an inform the user what is needed. This is