mirror of
https://github.com/frappe/bench.git
synced 2024-11-12 00:06:36 +00:00
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 <shenoy.ameya@gmail.com>
This commit is contained in:
parent
222d4605f6
commit
d99780b041
@ -176,7 +176,6 @@ def setup_env(bench_path='.', python = 'python'):
|
|||||||
exec_cmd('virtualenv -q {} -p {}'.format('env', python), cwd=bench_path)
|
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 --upgrade pip'.format(pip), cwd=bench_path)
|
||||||
exec_cmd('{} -q install wheel'.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 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)
|
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')
|
bench_req_file = os.path.join(os.path.dirname(bench.__path__[0]), 'requirements.txt')
|
||||||
install_requirements(pip, bench_req_file)
|
install_requirements(pip, bench_req_file)
|
||||||
|
|
||||||
|
from .app import install_app
|
||||||
for app in os.listdir(apps_dir):
|
for app in os.listdir(apps_dir):
|
||||||
req_file = os.path.join(apps_dir, app, 'requirements.txt')
|
install_app(app, bench_path=bench_path)
|
||||||
install_requirements(pip, req_file)
|
|
||||||
|
|
||||||
def update_node_packages(bench_path='.'):
|
def update_node_packages(bench_path='.'):
|
||||||
print('Updating node packages...')
|
print('Updating node packages...')
|
||||||
|
Loading…
Reference in New Issue
Block a user