2
0
mirror of https://github.com/frappe/bench.git synced 2024-11-11 15:51:03 +00:00

[fix] remove wheels as latest pip uses wheels and cache automatically, install pdfkit from git

This commit is contained in:
Anand Doshi 2015-12-09 18:41:34 +05:30
parent c45cb2b003
commit 245eecdeda
2 changed files with 6 additions and 4 deletions

View File

@ -71,7 +71,8 @@ def new_app(app, bench='.'):
def install_app(app, bench='.', verbose=False):
logger.info('installing {}'.format(app))
conf = get_config()
find_links = '--find-links={}'.format(conf.get('wheel_cache_dir')) if conf.get('wheel_cache_dir') else ''
# find_links = '--find-links={}'.format(conf.get('wheel_cache_dir')) if conf.get('wheel_cache_dir') else ''
find_links = ''
exec_cmd("{pip} install {quiet} {find_links} -e {app}".format(
pip=os.path.join(bench, 'env', 'bin', 'pip'),
quiet="-q" if not verbose else "",

View File

@ -63,9 +63,9 @@ def init(path, apps_path=None, no_procfile=False, no_backups=False,
setup_env(bench=path)
put_config(default_config, bench=path)
if wheel_cache_dir:
update_config({"wheel_cache_dir":wheel_cache_dir}, bench=path)
prime_wheel_cache(bench=path)
# if wheel_cache_dir:
# update_config({"wheel_cache_dir":wheel_cache_dir}, bench=path)
# prime_wheel_cache(bench=path)
if not frappe_path:
frappe_path = 'https://github.com/frappe/frappe.git'
@ -109,6 +109,7 @@ def setup_env(bench='.'):
exec_cmd('./env/bin/pip -q install --upgrade pip', cwd=bench)
exec_cmd('./env/bin/pip -q install wheel', cwd=bench)
exec_cmd('./env/bin/pip -q install https://github.com/frappe/MySQLdb1/archive/MySQLdb-1.2.5-patched.tar.gz', cwd=bench)
exec_cmd('./env/bin/pip -q install -e git+https://github.com/frappe/python-pdfkit.git#egg=pdfkit')
def setup_socketio(bench='.'):
exec_cmd("npm install socket.io redis express superagent cookie", cwd=bench)