##// END OF EJS Templates
don't rely on setuptools for readline dependency check
MinRK -
Show More
@@ -62,6 +62,7 b' from setupbase import ('
62 check_for_dependencies,
62 check_for_dependencies,
63 record_commit_info,
63 record_commit_info,
64 )
64 )
65 from setupext.setupext import check_for_readline
65
66
66 isfile = os.path.isfile
67 isfile = os.path.isfile
67 pjoin = os.path.join
68 pjoin = os.path.join
@@ -219,10 +220,14 b" if 'setuptools' in sys.modules:"
219 test='nose>=0.10.1',
220 test='nose>=0.10.1',
220 )
221 )
221 requires = setup_args.setdefault('install_requires', [])
222 requires = setup_args.setdefault('install_requires', [])
222 if sys.platform == 'darwin':
223 if not check_for_readline():
223 requires.append('readline')
224 if sys.platform == 'darwin':
224 elif sys.platform.startswith('win'):
225 requires.append('readline')
225 requires.append('pyreadline')
226 elif sys.platform.startswith('win'):
227 requires.append('pyreadline')
228 else:
229 pass
230 # do we want to install readline here?
226
231
227 # Script to be run by the windows binary installer after the default setup
232 # Script to be run by the windows binary installer after the default setup
228 # routine, to add shortcuts and similar windows-only things. Windows
233 # routine, to add shortcuts and similar windows-only things. Windows
General Comments 0
You need to be logged in to leave comments. Login now