##// END OF EJS Templates
Fix: "python ABS/PATH/TO/ipython.py" fails...
Takafumi Arakaki -
Show More
@@ -40,6 +40,7 b' from setupext import install_data_ext'
40 40 # A few handy globals
41 41 isfile = os.path.isfile
42 42 pjoin = os.path.join
43 repo_root = os.path.dirname(os.path.abspath(__file__))
43 44
44 45 def oscmd(s):
45 46 print(">", s)
@@ -72,7 +73,7 b' def file_doesnt_endwith(test,endings):'
72 73 #---------------------------------------------------------------------------
73 74
74 75 # release.py contains version, authors, license, url, keywords, etc.
75 execfile(pjoin('IPython','core','release.py'), globals())
76 execfile(pjoin(repo_root, 'IPython','core','release.py'), globals())
76 77
77 78 # Create a dict with the basic information
78 79 # This dict is eventually passed to setup after additional keys are added.
@@ -373,8 +374,6 b' def check_for_dependencies():'
373 374 # VCS related
374 375 #---------------------------------------------------------------------------
375 376
376 here = os.path.abspath(os.path.dirname(__file__))
377
378 377 # utils.submodule has checks for submodule status
379 378 execfile(pjoin('IPython','utils','submodule.py'), globals())
380 379
@@ -401,7 +400,7 b' class UpdateSubmodules(Command):'
401 400 failure = e
402 401 print(e)
403 402
404 if not check_submodule_status(here) == 'clean':
403 if not check_submodule_status(repo_root) == 'clean':
405 404 print("submodules could not be checked out")
406 405 sys.exit(1)
407 406
@@ -462,7 +461,7 b' def require_submodules(command):'
462 461 """decorator for instructing a command to check for submodules before running"""
463 462 class DecoratedCommand(command):
464 463 def run(self):
465 if not check_submodule_status(here) == 'clean':
464 if not check_submodule_status(repo_root) == 'clean':
466 465 print("submodules missing! Run `setup.py submodule` and try again")
467 466 sys.exit(1)
468 467 command.run(self)
General Comments 0
You need to be logged in to leave comments. Login now