Merge pull request #76 from frappe/fix-maridb-patch

Fix maridb patch

bench/cli.py

@@ -380,12 +380,6 @@ def config_http_timeout(seconds):
 def patch():
 	pass
 
-@click.command('mariadb-config')
-def _patch_mariadb_config():
-	"patch MariaDB 5.5.40"
-	repo_dir = os.path.dirname(__file__)
-	exec_cmd(os.path.join(repo_dir, 'patches', 'fix-mariadb.sh'), cwd=os.path.join(repo_dir, 'patches'))
-
 @click.command('fix-perms')
 def _fix_perms():
 	if os.path.exists("config/supervisor.conf"):
@@ -419,7 +413,6 @@ def _fix_perms():
 		exec_cmd("supervisorctl reload")
 
 
-patch.add_command(_patch_mariadb_config)
 patch.add_command(_fix_perms)
 
 #Bench commands

bench/utils.py

@@ -66,6 +66,7 @@ def exec_cmd(cmd, cwd='.'):
 def setup_env(bench='.'):
 	exec_cmd('virtualenv -q {} -p {}'.format('env', sys.executable), cwd=bench)
 	exec_cmd('./env/bin/pip -q install wheel', cwd=bench)
+	exec_cmd('./env/bin/pip -q install https://github.com/frappe/MySQLdb1/archive/MySQLdb-1.2.5-patched.tar.gz', cwd=bench)
 
 def setup_procfile(bench='.'):
 	with open(os.path.join(bench, 'Procfile'), 'w') as f:

install_scripts/setup_frappe.sh

@@ -310,8 +310,6 @@ install_bench() {
 		exit 1
 	fi
 	run_cmd sudo $PIP install -e /home/$FRAPPE_USER/bench-repo
-	# temp MariaDB fix
-	sudo bench patch mariadb-config
 }
 
 setup_bench() {