Show More
@@ -218,6 +218,11 b" if 'setuptools' in sys.modules:" | |||||
218 | doc='Sphinx>=0.3', |
|
218 | doc='Sphinx>=0.3', | |
219 | test='nose>=0.10.1', |
|
219 | test='nose>=0.10.1', | |
220 | ) |
|
220 | ) | |
|
221 | requires = setup_args.setdefault('install_requires', []) | |||
|
222 | if sys.platform == 'darwin': | |||
|
223 | requires.append('readline') | |||
|
224 | elif sys.platform.startswith('win'): | |||
|
225 | requires.append('pyreadline') | |||
221 |
|
226 | |||
222 | # Script to be run by the windows binary installer after the default setup |
|
227 | # Script to be run by the windows binary installer after the default setup | |
223 | # routine, to add shortcuts and similar windows-only things. Windows |
|
228 | # routine, to add shortcuts and similar windows-only things. Windows |
@@ -310,7 +310,7 b' def check_for_dependencies():' | |||||
310 | print_line, print_raw, print_status, |
|
310 | print_line, print_raw, print_status, | |
311 | check_for_sphinx, check_for_pygments, |
|
311 | check_for_sphinx, check_for_pygments, | |
312 | check_for_nose, check_for_pexpect, |
|
312 | check_for_nose, check_for_pexpect, | |
313 | check_for_pyzmq |
|
313 | check_for_pyzmq, check_for_readline | |
314 | ) |
|
314 | ) | |
315 | print_line() |
|
315 | print_line() | |
316 | print_raw("BUILDING IPYTHON") |
|
316 | print_raw("BUILDING IPYTHON") | |
@@ -327,7 +327,7 b' def check_for_dependencies():' | |||||
327 | check_for_nose() |
|
327 | check_for_nose() | |
328 | check_for_pexpect() |
|
328 | check_for_pexpect() | |
329 | check_for_pyzmq() |
|
329 | check_for_pyzmq() | |
330 |
|
330 | check_for_readline() | ||
331 |
|
331 | |||
332 | def record_commit_info(pkg_dir, build_cmd=build_py): |
|
332 | def record_commit_info(pkg_dir, build_cmd=build_py): | |
333 | """ Return extended build command class for recording commit |
|
333 | """ Return extended build command class for recording commit |
@@ -140,3 +140,18 b' def check_for_pyzmq():' | |||||
140 | print_status("pyzmq", zmq.__version__) |
|
140 | print_status("pyzmq", zmq.__version__) | |
141 | return True |
|
141 | return True | |
142 |
|
142 | |||
|
143 | def check_for_readline(): | |||
|
144 | try: | |||
|
145 | import readline | |||
|
146 | except ImportError: | |||
|
147 | try: | |||
|
148 | import pyreadline | |||
|
149 | except ImportError: | |||
|
150 | print_status('readline', "no (required for good interactive behavior)") | |||
|
151 | return False | |||
|
152 | else: | |||
|
153 | print_status('readline', "yes pyreadline-"+pyreadline.release.version) | |||
|
154 | return True | |||
|
155 | else: | |||
|
156 | print_status('readline', "yes") | |||
|
157 | return True |
General Comments 0
You need to be logged in to leave comments.
Login now