aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-12-27 23:44:36 +0100
committerJustin M. Keyes <justinkz@gmail.com>2016-12-28 00:18:01 +0100
commit068399b13b35e2c28c6139b106f6afe522700a7d (patch)
tree1eeba23bb654d8dbb75bbdf041269727a9234f75
parentf2be05d6a3fc851cc2a722b7dfa8cf5e8fcae1dd (diff)
downloadrneovim-068399b13b35e2c28c6139b106f6afe522700a7d.tar.gz
rneovim-068399b13b35e2c28c6139b106f6afe522700a7d.tar.bz2
rneovim-068399b13b35e2c28c6139b106f6afe522700a7d.zip
ci: Upgrade pip3 (instead of install)
-rwxr-xr-x.ci/before_install.sh11
-rwxr-xr-x.ci/install.sh6
2 files changed, 5 insertions, 12 deletions
diff --git a/.ci/before_install.sh b/.ci/before_install.sh
index 1bdd89de42..9aac37de12 100755
--- a/.ci/before_install.sh
+++ b/.ci/before_install.sh
@@ -11,18 +11,15 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
brew update
fi
-echo "Upgrade Python 2's pip."
+echo "Upgrade Python 2 pip."
pip2.7 -q install --user --upgrade pip
if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
echo "Install Python 3."
brew install python3
- echo "Upgrade Python 3's pip."
+ echo "Upgrade Python 3 pip."
pip3 -q install --user --upgrade pip
else
- # TODO: Replace with upgrade when Travis gets python3-pip package.
- echo "Install pip for Python 3."
- curl -sSL https://bootstrap.pypa.io/get-pip.py -o "${HOME}/get-pip.py"
- # After this, pip in PATH will refer to Python 3's pip.
- python3.3 "${HOME}/get-pip.py" --user --upgrade
+ echo "Upgrade Python 3 pip."
+ pip3 -q install --user --upgrade pip
fi
diff --git a/.ci/install.sh b/.ci/install.sh
index 9df5b6e980..98d3dc01cb 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -17,11 +17,7 @@ echo "Install neovim module and coveralls for Python 2."
CC=cc pip2.7 -q install --user --upgrade neovim cpp-coveralls
echo "Install neovim module for Python 3."
-if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
- CC=cc pip3 -q install --user --upgrade neovim
-else
- CC=cc pip3.3 -q install --user --upgrade neovim
-fi
+CC=cc pip3 -q install --user --upgrade neovim
echo "Install neovim RubyGem."
gem install --no-document --version ">= 0.2.0" neovim