From 2ce6eed2c4be2eade7d0c9cdd55a984101a1d232 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Tue, 22 Jul 2014 12:08:17 +0530 Subject: [PATCH] update requirements on update, fix #34 --- bench/cli.py | 15 +++++++++------ bench/utils.py | 7 +++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/bench/cli.py b/bench/cli.py index dce6202b..20095c7b 100644 --- a/bench/cli.py +++ b/bench/cli.py @@ -9,7 +9,7 @@ from .utils import start as _start from .utils import setup_procfile as _setup_procfile from .utils import set_nginx_port as _set_nginx_port from .utils import set_default_site as _set_default_site -from .utils import build_assets, patch_sites, exec_cmd, update_bench, get_frappe, setup_logging, get_config, update_config, restart_supervisor_processes, put_config, default_config +from .utils import build_assets, patch_sites, exec_cmd, update_bench, get_frappe, setup_logging, get_config, update_config, restart_supervisor_processes, put_config, default_config, update_requirements from .app import get_app as _get_app from .app import new_app as _new_app from .app import pull_all_apps @@ -68,13 +68,14 @@ def new_site(site): @click.option('--patch',flag_value=True, type=bool, help="Run migrations for all sites in the bench") @click.option('--build',flag_value=True, type=bool, help="Build JS and CSS artifacts for the bench") @click.option('--bench',flag_value=True, type=bool, help="Update bench") +@click.option('--requirements',flag_value=True, type=bool, help="Update requirements") @click.option('--restart-supervisor',flag_value=True, type=bool, help="restart supervisor processes after update") @click.option('--auto',flag_value=True, type=bool) -def update(pull=False, patch=False, build=False, bench=False, auto=False, restart_supervisor=False): +def update(pull=False, patch=False, build=False, bench=False, auto=False, restart_supervisor=False, requirements=False): "Update bench" - if not (pull or patch or build or bench): - pull, patch, build, bench = True, True, True, True + if not (pull or patch or build or bench or requirements): + pull, patch, build, bench, requirements = True, True, True, True, True conf = get_config() if auto and not conf.get('auto_update'): @@ -83,12 +84,14 @@ def update(pull=False, patch=False, build=False, bench=False, auto=False, restar update_bench() if pull: pull_all_apps() + if requirements: + update_requirements() if patch: patch_sites() if build: build_assets() - # if restart_supervisor or conf.get('restart_supervisor_on_update'): - # restart_supervisor_processes() + if restart_supervisor or conf.get('restart_supervisor_on_update'): + restart_supervisor_processes() print "_"*80 print "https://frappe.io/buy - Donate to help make better free and open source tools" diff --git a/bench/utils.py b/bench/utils.py index ca0418b2..3730b8be 100644 --- a/bench/utils.py +++ b/bench/utils.py @@ -215,3 +215,10 @@ def set_default_site(site, bench='.'): exec_cmd("{frappe} --use {site}".format(frappe=get_frappe(bench=bench), site=site), cwd=os.path.join(bench, 'sites')) +def update_requirements(bench='.'): + pip = os.path.join(bench, 'env', 'bin', 'pip') + apps_dir = os.path.join(bench, 'apps') + for app in os.listdir(apps_dir): + req_file = os.path.join(apps_dir, app, 'requirements.txt') + if os.path.exists(req_file): + exec_cmd("{pip} install -r {req_file}".format(pip=pip, req_file=req_file))