From c6e559b8b944642fccd5331b84e17ec372d8e03a Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Tue, 17 Apr 2018 16:30:11 +0530 Subject: [PATCH] better coding practices --- bench/utils.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bench/utils.py b/bench/utils.py index 7458e5c7..276b6895 100755 --- a/bench/utils.py +++ b/bench/utils.py @@ -171,13 +171,14 @@ def which(executable, raise_err = False): def setup_env(bench_path='.', python = 'python'): python = which(python, raise_err = True) + pip = os.path.join(bench_path, 'env', 'bin', 'pip') exec_cmd('virtualenv -q {} -p {}'.format('env', python), cwd=bench_path) - exec_cmd('./env/bin/pip -q install --upgrade pip', cwd=bench_path) - exec_cmd('./env/bin/pip -q install wheel', cwd=bench_path) - # exec_cmd('./env/bin/pip -q install https://github.com/frappe/MySQLdb1/archive/MySQLdb-1.2.5-patched.tar.gz', cwd=bench_path) - exec_cmd('./env/bin/pip -q install six', cwd=bench_path) - exec_cmd('./env/bin/pip -q install -e git+https://github.com/frappe/python-pdfkit.git#egg=pdfkit', 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) def setup_socketio(bench_path='.'): exec_cmd("npm install socket.io redis express superagent cookie babel-core less chokidar \