Merge 'master' of frappe/bench into systemd

.travis.yml

@@ -23,7 +23,7 @@ install:
 
 script:
   - cd ~
-  - sudo pip install --upgrade pip
+  - sudo pip install --upgrade pip==9.0.3
   - sudo pip install -e ~/.bench
   # - sudo python -m unittest bench.tests.test_setup_production.TestSetupProduction.test_setup_production_v6
   - sudo python -m unittest -v bench.tests.test_setup_production

bench/commands/__init__.py

@@ -158,7 +158,8 @@ def migrate_env(python, no_backup = False):
 		), cwd = path)
 
 		pip = osp.join(pvenv, 'bin', 'pip')
-		exec_cmd('{pip} install --upgrade pip'.format(pip=pip))
+		# pip 10 seems to have a few problems associated with it, temporary freeze pip at 9.0.3 
+		exec_cmd('{pip} install --upgrade pip==9.0.3'.format(pip=pip))
 		exec_cmd('{pip} install --upgrade setuptools'.format(pip=pip))
 		# TODO: Options
 

bench/utils.py

@@ -167,7 +167,7 @@ def setup_env(bench_path='.', python = 'python'):
 	python = which(python, raise_err = True)
 
 	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 --upgrade pip==9.0.3', 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)
@@ -415,8 +415,8 @@ def update_requirements(bench_path='.'):
 	print('Updating Python libraries...')
 	pip = os.path.join(bench_path, 'env', 'bin', 'pip')
 
-	# upgrade pip to latest
-	exec_cmd("{pip} install --upgrade pip".format(pip=pip))
+	# pip 10 seems to have a few problems associated with it, temporary freeze pip at 9.0.3 
+	exec_cmd("{pip} install --upgrade pip==9.0.3".format(pip=pip))
 
 	apps_dir = os.path.join(bench_path, 'apps')
 

playbooks/install.py

@@ -36,26 +36,22 @@ def install_bench(args):
 	# secure pip installation
 	if find_executable('pip'):
 		run_os_command({
-			'yum': 'sudo pip install --upgrade setuptools pip',
-			'apt-get': 'sudo pip install --upgrade setuptools pip',
-			'brew': "sudo pip install --upgrade setuptools pip --user"
+			'pip': 'sudo pip install --upgrade setuptools pip==9.0.3'
 		})
 
 	else:
 		if not os.path.exists("get-pip.py"):
 			run_os_command({
-				'apt-get': 'wget https://bootstrap.pypa.io/get-pip.py',
-				'yum': 'wget https://bootstrap.pypa.io/get-pip.py'
+				'wget': 'wget https://bootstrap.pypa.io/get-pip.py'
 			})
 
 		success = run_os_command({
-			'apt-get': 'sudo python get-pip.py',
-			'yum': 'sudo python get-pip.py',
+			'python': 'sudo python get-pip.py --force-reinstall'
 		})
 
 		if success:
 			run_os_command({
-				'pip': 'sudo pip install --upgrade pip setuptools',
+				'pip': 'sudo pip install --upgrade pip==9.0.3 setuptools',
 			})
 
 	success = run_os_command({

setup.py

@@ -1,5 +1,8 @@
 from setuptools import setup, find_packages
-from pip.req import parse_requirements
+try: # for pip >= 10
+	from pip._internal.req import parse_requirements
+except ImportError: # for pip <= 9.0.3
+	from pip.req import parse_requirements
 import re, ast
 
 # get version from __version__ variable in bench/__init__.py