Skip to content

Commit

Permalink
fix: install app instead of requirements.txt
Browse files Browse the repository at this point in the history
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 <shenoy.ameya@gmail.com>
  • Loading branch information
codingCoffee committed Nov 7, 2018
1 parent 222d460 commit d99780b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions bench/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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...')
Expand Down

0 comments on commit d99780b

Please sign in to comment.