Merge pull request #5181 from minrk/gnureadline

use gnureadline on OS X
Brian E. Granger 12 years ago
commit 84c9b8e041

@ -279,7 +279,8 @@ for deps in extras_require.values():
extras_require['all'] = everything
install_requires = []
if sys.platform == 'darwin':
install_requires.append('readline')
if any(arg.startswith('bdist') for arg in sys.argv) or not setupext.check_for_readline():
install_requires.append('gnureadline')
elif sys.platform.startswith('win'):
# Pyreadline has unicode and Python 3 fixes in 2.0
install_requires.append('pyreadline>=2.0')

@ -639,10 +639,10 @@ def get_bdist_wheel():
if found:
lis.pop(idx)
for pkg in ("readline", "pyreadline"):
for pkg in ("gnureadline", "pyreadline"):
_remove_startswith(requires, pkg)
requires.append("readline; sys.platform == 'darwin'")
requires.append("pyreadline (>=2.0); sys.platform == 'win32'")
requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'")
requires.append("pyreadline (>=2.0); sys.platform == 'win32' and platform.python_implementation == 'CPython'")
for r in requires:
pkg_info['Requires-Dist'] = r
write_pkg_info(metadata_path, pkg_info)

Loading…
Cancel
Save