From 66dd5af0871d0c81faee6ed43a595bb2d3ee9c23 Mon Sep 17 00:00:00 2001 From: gavin Date: Mon, 10 Feb 2020 14:56:55 +0530 Subject: [PATCH] Revert "fix: pip pinned to 19.3.1 after v20 breaking" --- .circleci/config.yml | 4 ++-- .travis.yml | 2 +- bench/utils.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6973b24a..c067e4ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: - checkout - run: name: Setup - command: | + command: | sudo pip install --ignore-installed setuptools sudo pip install urllib3 pyOpenSSL ndg-httpsclient pyasn1 sudo cp -r ~/.ssh/* /root/.ssh @@ -24,7 +24,7 @@ jobs: name: Setup Tests command: | cd ~ - sudo pip install --upgrade pip==19.3.1 + sudo pip install --upgrade pip sudo pip install -e ~/.bench - run: diff --git a/.travis.yml b/.travis.yml index 0a28ec6b..9df3b6d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: script: - cd ~ - - sudo pip install --upgrade pip==19.3.1 + - sudo pip install --upgrade pip - 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/utils.py b/bench/utils.py index fc7f4a1b..10a4f801 100755 --- a/bench/utils.py +++ b/bench/utils.py @@ -209,7 +209,7 @@ def setup_env(bench_path='.', python = 'python3'): pip = os.path.join('env', 'bin', 'pip') exec_cmd('virtualenv -q {} -p {}'.format('env', python), cwd=bench_path) - exec_cmd('{} -q install -U pip==19.3.1 wheel six'.format(pip), 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) def setup_socketio(bench_path='.'):