From a0bc590cdbbd2f991a2864a721d32508bff421b1 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Thu, 15 Aug 2019 10:59:37 +0100 Subject: [PATCH 1/3] Install pip on Python 3 as well --- cookbooks/travis_build_environment/recipes/pip.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cookbooks/travis_build_environment/recipes/pip.rb b/cookbooks/travis_build_environment/recipes/pip.rb index 70c78c1a3..c9731ee80 100644 --- a/cookbooks/travis_build_environment/recipes/pip.rb +++ b/cookbooks/travis_build_environment/recipes/pip.rb @@ -6,6 +6,15 @@ not_if 'which pip' end +bash 'install-pip3' do + cwd Chef::Config[:file_cache_path] + code <<-INSTALL_PIP3 + python3 get-pip.py + pip3 install --upgrade pip setuptools wheel + INSTALL_PIP3 + not_if 'which pip3' +end + bash 'install-pip' do cwd Chef::Config[:file_cache_path] code <<-INSTALL_PIP From bdb38cbcab4023bd189650c47ecbe108967bb75c Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Thu, 15 Aug 2019 11:32:00 +0100 Subject: [PATCH 2/3] Whitespace change to re-run Travis --- cookbooks/travis_build_environment/recipes/pip.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/travis_build_environment/recipes/pip.rb b/cookbooks/travis_build_environment/recipes/pip.rb index c9731ee80..69a05944e 100644 --- a/cookbooks/travis_build_environment/recipes/pip.rb +++ b/cookbooks/travis_build_environment/recipes/pip.rb @@ -14,7 +14,7 @@ INSTALL_PIP3 not_if 'which pip3' end - + bash 'install-pip' do cwd Chef::Config[:file_cache_path] code <<-INSTALL_PIP From 919d1d280deab4b3fa66f3d0f799dae791a57746 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Thu, 15 Aug 2019 11:50:48 +0100 Subject: [PATCH 3/3] Remove trailing whitespace again --- cookbooks/travis_build_environment/recipes/pip.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/travis_build_environment/recipes/pip.rb b/cookbooks/travis_build_environment/recipes/pip.rb index 69a05944e..c9731ee80 100644 --- a/cookbooks/travis_build_environment/recipes/pip.rb +++ b/cookbooks/travis_build_environment/recipes/pip.rb @@ -14,7 +14,7 @@ INSTALL_PIP3 not_if 'which pip3' end - + bash 'install-pip' do cwd Chef::Config[:file_cache_path] code <<-INSTALL_PIP