Merge pull request #957 from frappe/develop

Merge 'develop' into 'master'

bench/app.py

@@ -60,10 +60,7 @@ def write_appstxt(apps, bench_path='.'):
 		return f.write('\n'.join(apps))
 
 def check_url(url, raise_err=True):
-	try:
-		from urlparse import urlparse
-	except ImportError:
-		from urllib.parse import urlparse
+	from six.moves.urllib.parse import urlparse
 
 	parsed = urlparse(url)
 	if not parsed.scheme:

bench/commands/config.py

@@ -25,12 +25,6 @@ def config_restart_systemd_on_update(state):
 	update_config({'restart_systemd_on_update': state == 'on'})
 
 
-@click.command('update_bench_on_update', help='Enable/Disable bench updates on running bench update')
-@click.argument('state', type=click.Choice(['on', 'off']))
-def config_update_bench_on_update(state):
-	update_config({'update_bench_on_update': state == 'on'})
-
-
 @click.command('dns_multitenant', help='Enable/Disable bench multitenancy on running bench update')
 @click.argument('state', type=click.Choice(['on', 'off']))
 def config_dns_multitenant(state):
@@ -83,7 +77,6 @@ def remove_common_config(keys):
 	put_config(common_site_config)
 
 
-config.add_command(config_update_bench_on_update)
 config.add_command(config_restart_supervisor_on_update)
 config.add_command(config_restart_systemd_on_update)
 config.add_command(config_dns_multitenant)

bench/commands/update.py

@@ -14,16 +14,15 @@ from bench.utils import post_upgrade, patch_sites, build_assets
 @click.option('--pull', is_flag=True, help="Pull updates for all the apps in bench")
 @click.option('--patch', is_flag=True, help="Run migrations for all sites in the bench")
 @click.option('--build', is_flag=True, help="Build JS and CSS assets for the bench")
-@click.option('--bench', is_flag=True, help="Update bench CLI tool")
 @click.option('--requirements', is_flag=True, help="Update requirements. If run alone, equivalent to `bench setup requirements`")
 @click.option('--restart-supervisor', is_flag=True, help="Restart supervisor processes after update")
 @click.option('--restart-systemd', is_flag=True, help="Restart systemd units after update")
 @click.option('--no-backup', is_flag=True, help="If this flag is set, sites won't be backed up prior to updates. Note: This is not recommended in production.")
 @click.option('--force', is_flag=True, help="Forces major version upgrades")
 @click.option('--reset', is_flag=True, help="Hard resets git branch's to their new states overriding any changes and overriding rebase on pull")
-def update(pull, patch, build, bench, requirements, restart_supervisor, restart_systemd, no_backup, force, reset):
+def update(pull, patch, build, requirements, restart_supervisor, restart_systemd, no_backup, force, reset):
 	from bench.utils import update
-	update(pull=pull, patch=patch, build=build, bench=bench, requirements=requirements, restart_supervisor=restart_supervisor, restart_systemd=restart_systemd, backup= not no_backup, force=force, reset=reset)
+	update(pull=pull, patch=patch, build=build, requirements=requirements, restart_supervisor=restart_supervisor, restart_systemd=restart_systemd, backup=not no_backup, force=force, reset=reset)
 
 
 @click.command('retry-upgrade', help="Retry a failed upgrade")

bench/config/common_site_config.py

@@ -1,9 +1,12 @@
-import os, multiprocessing, getpass, json
+# imports - standard imports
+import getpass
+import json
+import multiprocessing
+import os
+
+# imports - third party imports
+from six.moves.urllib.parse import urlparse
 
-try:
-	from urllib.parse import urlparse
-except ImportError:
-	from urlparse import urlparse
 
 default_config = {
 	'restart_supervisor_on_update': False,
@@ -11,7 +14,6 @@ default_config = {
 	'auto_update': False,
 	'serve_default_site': True,
 	'rebase_on_pull': False,
-	'update_bench_on_update': True,
 	'frappe_user': getpass.getuser(),
 	'shallow_clone': True,
 	'background_workers': 1

bench/config/redis.py

@@ -1,11 +1,16 @@
-from .common_site_config import get_config
-import re, os, subprocess, semantic_version
-import bench
+# imports - standard imports
+import os
+import re
+import subprocess
+
+# imports - third party imports
+import semantic_version
+from six.moves.urllib.parse import urlparse
+
+# imports - module imports
+import bench
+from bench.config.common_site_config import get_config
 
-try:
-	from urllib.parse import urlparse
-except ImportError:
-	from urlparse import urlparse
 
 def generate_config(bench_path):
 	config = get_config(bench_path)

bench/utils.py

@@ -154,20 +154,9 @@ def init(path, apps_path=None, no_procfile=False, no_backups=False,
 	copy_patches_txt(path)
 
 
-def restart_update(kwargs):
-	args = ['--'+k for k, v in list(kwargs.items()) if v]
-	os.execv(sys.argv[0], sys.argv[:2] + args)
-
-
-def update(pull=False, patch=False, build=False, bench=False, restart_supervisor=False,
-	restart_systemd=False, requirements=False, backup=True, force=False, reset=False):
+def update(pull=False, patch=False, build=False, requirements=False, backup=True, force=False, reset=False,
+	restart_supervisor=False, restart_systemd=False):
 	"""command: bench update"""
-
-	if not is_bench_directory():
-		"""Update only bench CLI if bench update called from outside a bench"""
-		update_bench(bench_repo=True, requirements=True)
-		sys.exit(0)
-
 	from bench import patches
 	from bench.app import is_version_upgrade, pull_all_apps, validate_branch
 	from bench.config.common_site_config import get_config, update_config
@@ -180,20 +169,8 @@ def update(pull=False, patch=False, build=False, bench=False, restart_supervisor
 		print('Release bench detected, cannot update!')
 		sys.exit(1)
 
-	if not (pull or patch or build or bench or requirements):
-		pull, patch, build, bench, requirements = True, True, True, True, True
-
-	if bench and conf.get('update_bench_on_update'):
-		update_bench(bench_repo=True, requirements=False)
-		restart_update({
-			'pull': pull,
-			'patch': patch,
-			'build': build,
-			'requirements': requirements,
-			'no-backup': backup,
-			'restart-supervisor': restart_supervisor,
-			'reset': reset
-		})
+	if not (pull or patch or build or requirements):
+		pull, patch, build, requirements = True, True, True, True
 
 	validate_branch()
 	version_upgrade = is_version_upgrade()
@@ -208,8 +185,6 @@ def update(pull=False, patch=False, build=False, bench=False, restart_supervisor
 	if version_upgrade[0] or (not version_upgrade[0] and force):
 		validate_upgrade(version_upgrade[1], version_upgrade[2], bench_path=bench_path)
 
-	before_update(bench_path=bench_path, requirements=requirements)
-
 	conf.update({ "maintenance_mode": 1, "pause_scheduler": 1 })
 	update_config(conf, bench_path=bench_path)
 
@@ -306,13 +281,25 @@ def which(executable, raise_err = False):
 	return exec_
 
 
-def setup_env(bench_path='.', python = 'python3'):
-	python = which(python, raise_err = True)
-	pip    = os.path.join('env', 'bin', 'pip')
+def get_venv_path():
+	venv = which('virtualenv')
 
-	exec_cmd('virtualenv -q {} -p {}'.format('env', python), cwd=bench_path)
-	exec_cmd('{} -q install -U pip wheel 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)
+	if not venv:
+		current_python = sys.executable
+		with open(os.devnull, "wb") as devnull:
+			is_venv_installed = not subprocess.call([current_python, "-m", "venv", "--help"], stdout=devnull)
+		if is_venv_installed:
+			venv = "{} -m venv".format(current_python)
+
+	return venv or log("virtualenv cannot be found", level=2)
+
+def setup_env(bench_path='.', python='python3'):
+	frappe = os.path.join(bench_path, "apps", "frappe")
+	pip = os.path.join(".", "env", "bin", "pip")
+	virtualenv = get_venv_path()
+
+	exec_cmd('{} -q env -p {}'.format(virtualenv, python), cwd=bench_path)
+	exec_cmd('{} install -q -U -e {}'.format(pip, frappe), cwd=bench_path)
 
 
 def setup_socketio(bench_path='.'):
@@ -388,25 +375,6 @@ def read_crontab():
 	return out
 
 
-def update_bench(bench_repo=True, requirements=True):
-	logger.info("Updating bench")
-
-	# bench-repo folder
-	cwd = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-	if bench_repo:
-		try:
-			exec_cmd("git pull", cwd=cwd)
-		except bench.utils.CommandFailedError:
-			exec_cmd("git -c user.name=bench -c user.email=developers@frappe.io stash", cwd=cwd)
-			logger.info("Stashing changes made at {}\nUse git stash apply to recover changes after the successful update!".format(cwd))
-
-	if requirements:
-		update_bench_requirements()
-
-	logger.info("Bench Updated!")
-
-
 def setup_sudoers(user):
 	from bench import env
 
@@ -582,11 +550,6 @@ def set_default_site(site, bench_path='.'):
 			cwd=os.path.join(bench_path, 'sites'))
 
 
-def update_bench_requirements():
-	bench_req_file = os.path.join(os.path.dirname(bench.__path__[0]), 'requirements.txt')
-	install_requirements(bench_req_file, user=True)
-
-
 def update_env_pip(bench_path):
 	env_pip = os.path.join(bench_path, 'env', 'bin', 'pip')
 	exec_cmd("{pip} install -q -U pip".format(pip=env_pip))
@@ -596,9 +559,6 @@ def update_requirements(bench_path='.'):
 	from bench.app import get_apps, install_app
 	print('Updating Python libraries...')
 
-	# Update bench requirements (at user level)
-	update_bench_requirements()
-
 	# update env pip
 	update_env_pip(bench_path)
 
@@ -940,38 +900,6 @@ def get_output(*cmd):
 	return out
 
 
-def before_update(bench_path, requirements):
-	validate_pillow_dependencies(bench_path, requirements)
-
-
-def validate_pillow_dependencies(bench_path, requirements):
-	if not requirements:
-		return
-
-	try:
-		pip = os.path.join(bench_path, 'env', 'bin', 'pip')
-		exec_cmd("{pip} install Pillow".format(pip=pip))
-
-	except CommandFailedError:
-		distro = platform.linux_distribution()
-		distro_name = distro[0].lower()
-		if "centos" in distro_name or "fedora" in distro_name:
-			print("Please install these dependencies using the command:")
-			print("sudo yum install libtiff-devel libjpeg-devel libzip-devel freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel")
-
-			raise
-
-		elif "ubuntu" in distro_name or "elementary os" in distro_name or "debian" in distro_name:
-			print("Please install these dependencies using the command:")
-
-			if "ubuntu" in distro_name and distro[1]=="12.04":
-				print("sudo apt-get install -y libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk")
-			else:
-				print("sudo apt-get install -y libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python-tk")
-
-			raise
-
-
 def get_bench_name(bench_path):
 	return os.path.basename(os.path.abspath(bench_path))