2
0
mirror of https://github.com/frappe/bench.git synced 2024-09-22 20:19:01 +00:00

Merge pull request #641 from codingCoffee/pip_9_freeze

froze pip at 9.0.3
This commit is contained in:
Ameya Shenoy 2018-04-16 16:30:28 +05:30 committed by GitHub
commit 17127366f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions

View File

@ -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

View File

@ -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

View File

@ -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')

View File

@ -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({