Permalink
Browse files

add pyrepl to setuptools

  • Loading branch information...
1 parent d62b24a commit 22757003854f701eb532bd0a84bf4d5d64b5ae20 @minrk committed Mar 30, 2013
Showing with 7 additions and 10 deletions.
  1. +2 −5 setup.py
  2. +5 −5 setupext/setupext.py
View
7 setup.py
@@ -239,16 +239,13 @@ def run(self):
requires = setup_args.setdefault('install_requires', [])
setupext.display_status = False
if not setupext.check_for_readline():
- if sys.platform == 'darwin':
- requires.append('readline')
- elif sys.platform.startswith('win'):
+ if sys.platform.startswith('win'):
# Pyreadline 64 bit windows issue solved in versions >=1.7.1
# Also solves issues with some older versions of pyreadline that
# satisfy the unconstrained depdendency.
requires.append('pyreadline>=1.7.1')
else:
- pass
- # do we want to install readline here?
+ requires.append('pyrepl>=0.8.4')
# Script to be run by the windows binary installer after the default setup
# routine, to add shortcuts and similar windows-only things. Windows
View
10 setupext/setupext.py
@@ -153,20 +153,20 @@ def check_for_pyzmq():
def check_for_readline():
from distutils.version import LooseVersion
try:
- import readline
+ import pyrepl
except ImportError:
try:
import pyreadline
vs = pyreadline.release.version
except (ImportError, AttributeError):
- print_status('readline', "no (required for good interactive behavior)")
+ print_status('pyrepl', "no (required for good interactive behavior)")
return False
if LooseVersion(vs).version >= [1,7,1]:
- print_status('readline', "yes pyreadline-" + vs)
+ print_status('pyrepl', "yes pyreadline-" + vs)
return True
else:
- print_status('readline', "no pyreadline-%s < 1.7.1" % vs)
+ print_status('pyrepl', "no pyreadline-%s < 1.7.1" % vs)
return False
else:
- print_status('readline', "yes")
+ print_status('pyrepl', "yes")
return True

0 comments on commit 2275700

Please sign in to comment.