diff --git a/.travis.yml b/.travis.yml index b0399dfd..e4b562b7 100644 --- a/.travis.yml +++ b/.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 diff --git a/bench/commands/__init__.py b/bench/commands/__init__.py index 174c082e..069ab644 100755 --- a/bench/commands/__init__.py +++ b/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 diff --git a/bench/utils.py b/bench/utils.py index 5ca1395e..a3ee6159 100755 --- a/bench/utils.py +++ b/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) @@ -408,8 +408,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') diff --git a/playbooks/install.py b/playbooks/install.py index 4d557373..0f826d4a 100644 --- a/playbooks/install.py +++ b/playbooks/install.py @@ -36,7 +36,7 @@ def install_bench(args): # secure pip installation if find_executable('pip'): run_os_command({ - 'pip': 'sudo pip install --upgrade setuptools pip' + 'pip': 'sudo pip install --upgrade setuptools pip==9.0.3' }) else: @@ -51,7 +51,7 @@ def install_bench(args): 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({