##// END OF EJS Templates
remove non-setuptools dependency checks
MinRK -
Show More
@@ -63,7 +63,7 b' from setupbase import ('
63 find_entry_points,
63 find_entry_points,
64 build_scripts_entrypt,
64 build_scripts_entrypt,
65 find_data_files,
65 find_data_files,
66 check_for_dependencies,
66 check_for_readline,
67 git_prebuild,
67 git_prebuild,
68 check_submodule_status,
68 check_submodule_status,
69 update_submodules,
69 update_submodules,
@@ -78,7 +78,6 b' from setupbase import ('
78 install_scripts_for_symlink,
78 install_scripts_for_symlink,
79 unsymlink,
79 unsymlink,
80 )
80 )
81 from setupext import setupext
82
81
83 isfile = os.path.isfile
82 isfile = os.path.isfile
84 pjoin = os.path.join
83 pjoin = os.path.join
@@ -277,7 +276,7 b' install_requires = ['
277 # add platform-specific dependencies
276 # add platform-specific dependencies
278 if sys.platform == 'darwin':
277 if sys.platform == 'darwin':
279 install_requires.append('appnope')
278 install_requires.append('appnope')
280 if 'bdist_wheel' in sys.argv[1:] or not setupext.check_for_readline():
279 if 'bdist_wheel' in sys.argv[1:] or not check_for_readline():
281 install_requires.append('gnureadline')
280 install_requires.append('gnureadline')
282
281
283 if sys.platform.startswith('win'):
282 if sys.platform.startswith('win'):
@@ -325,13 +324,6 b" if 'setuptools' in sys.modules:"
325 "ipython_win_post_install.py"}}
324 "ipython_win_post_install.py"}}
326
325
327 else:
326 else:
328 # If we are installing without setuptools, call this function which will
329 # check for dependencies an inform the user what is needed. This is
330 # just to make life easy for users.
331 for install_cmd in ('install', 'symlink'):
332 if install_cmd in sys.argv:
333 check_for_dependencies()
334 break
335 # scripts has to be a non-empty list, or install_scripts isn't called
327 # scripts has to be a non-empty list, or install_scripts isn't called
336 setup_args['scripts'] = [e.split('=')[0].strip() for e in find_entry_points()]
328 setup_args['scripts'] = [e.split('=')[0].strip() for e in find_entry_points()]
337
329
@@ -490,37 +490,23 b' class install_scripts_for_symlink(install_scripts):'
490 # Verify all dependencies
490 # Verify all dependencies
491 #---------------------------------------------------------------------------
491 #---------------------------------------------------------------------------
492
492
493 def check_for_dependencies():
493 def check_for_readline():
494 """Check for IPython's dependencies.
494 """Check for GNU readline"""
495
495 try:
496 This function should NOT be called if running under setuptools!
496 import gnureadline as readline
497 """
497 except ImportError:
498 from setupext.setupext import (
498 pass
499 print_line, print_raw, print_status,
499 else:
500 check_for_sphinx, check_for_pygments,
500 return True
501 check_for_nose, check_for_pexpect,
501 try:
502 check_for_pyzmq, check_for_readline,
502 import readline
503 check_for_jinja2, check_for_tornado
503 except ImportError:
504 )
504 return False
505 print_line()
505 else:
506 print_raw("BUILDING IPYTHON")
506 if sys.platform == 'darwin' and 'libedit' in readline.__doc__:
507 print_status('python', sys.version)
507 print("Ignoring readline linked to libedit", file=sys.stderr)
508 print_status('platform', sys.platform)
508 return False
509 if sys.platform == 'win32':
509 return True
510 print_status('Windows version', sys.getwindowsversion())
511
512 print_raw("")
513 print_raw("OPTIONAL DEPENDENCIES")
514
515 check_for_sphinx()
516 check_for_pygments()
517 check_for_nose()
518 if os.name == 'posix':
519 check_for_pexpect()
520 check_for_pyzmq()
521 check_for_tornado()
522 check_for_readline()
523 check_for_jinja2()
524
510
525 #---------------------------------------------------------------------------
511 #---------------------------------------------------------------------------
526 # VCS related
512 # VCS related
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now