From d99780b041fe7aceecb56984042ece59dd3b96e2 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Wed, 7 Nov 2018 13:32:03 +0530 Subject: [PATCH] fix: install app instead of requirements.txt pip installs the frappe apps instead of just their requirements.txt It needs to be done so as to prevent update the app version for pip and to prevent conflits for the dependencies in requirements.txt Signed-off-by: Ameya Shenoy --- bench/utils.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bench/utils.py b/bench/utils.py index ec5d6ff3..6ca27464 100755 --- a/bench/utils.py +++ b/bench/utils.py @@ -176,7 +176,6 @@ def setup_env(bench_path='.', python = 'python'): exec_cmd('virtualenv -q {} -p {}'.format('env', python), cwd=bench_path) exec_cmd('{} -q install --upgrade pip'.format(pip), cwd=bench_path) exec_cmd('{} -q install wheel'.format(pip), cwd=bench_path) - # exec_cmd('{pip} -q install https://github.com/frappe/MySQLdb1/archive/MySQLdb-1.2.5-patched.tar.gz'.format(pip), cwd=bench_path) exec_cmd('{} -q install six'.format(pip), cwd=bench_path) exec_cmd('{} -q install -e git+https://github.com/frappe/python-pdfkit.git#egg=pdfkit'.format(pip), cwd=bench_path) @@ -430,9 +429,9 @@ def update_requirements(bench_path='.'): bench_req_file = os.path.join(os.path.dirname(bench.__path__[0]), 'requirements.txt') install_requirements(pip, bench_req_file) + from .app import install_app for app in os.listdir(apps_dir): - req_file = os.path.join(apps_dir, app, 'requirements.txt') - install_requirements(pip, req_file) + install_app(app, bench_path=bench_path) def update_node_packages(bench_path='.'): print('Updating node packages...')