231 |
231 |
232 def normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir, res_env, logger, call_subprocess): |
232 def normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir, res_env, logger, call_subprocess): |
233 logger.notify("Install %s from %s with %s" % (key,res_env.URLS[key][res_source_key],method)) |
233 logger.notify("Install %s from %s with %s" % (key,res_env.URLS[key][res_source_key],method)) |
234 if method == 'pip': |
234 if method == 'pip': |
235 if sys.platform == 'win32': |
235 if sys.platform == 'win32': |
236 args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', os.path.abspath(home_dir), res_env.URLS[key][res_source_key]] |
236 args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', res_env.URLS[key][res_source_key]] |
237 else: |
237 else: |
238 args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', os.path.abspath(home_dir), res_env.URLS[key][res_source_key]] |
238 args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', res_env.URLS[key][res_source_key]] |
239 if option_str : |
239 if option_str : |
240 args.insert(4,option_str) |
240 args.insert(4,option_str) |
241 call_subprocess(args, |
241 call_subprocess(args, |
242 cwd=os.path.abspath(tmp_dir), |
242 cwd=os.path.abspath(tmp_dir), |
243 filter_stdout=filter_python_develop, |
243 filter_stdout=filter_python_develop, |