Skip to content

Commit

Permalink
Fixing Travis issues with latest setuptools
Browse files Browse the repository at this point in the history
  • Loading branch information
Valloric committed Feb 16, 2016
1 parent 18693fb commit 2f3ce73
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions ci/travis/travis_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ source ci/travis/travis_install.${TRAVIS_OS_NAME}.sh
# pyenv setup
#############

# Don't allow the get-pip.py script that pyenv will use to install setuptools or
# wheel; we'll install specific versions ourselves below.
export PIP_NO_SETUPTOOLS=1
export PIP_NO_WHEEL=1

# DON'T exit if error
set +e
git clone https://github.com/yyuu/pyenv.git ~/.pyenv
Expand All @@ -33,7 +38,7 @@ if [ "${YCMD_PYTHON_VERSION}" == "2.6" ]; then
elif [ "${YCMD_PYTHON_VERSION}" == "2.7" ]; then
PYENV_VERSION="2.7.6"
else
PYENV_VERSION="3.3.0"
PYENV_VERSION="3.3.6"
fi

pyenv install --skip-existing ${PYENV_VERSION}
Expand All @@ -52,9 +57,11 @@ test ${python_version} == ${YCMD_PYTHON_VERSION}
# pip setup
############

pip install -U pip wheel setuptools
# We want to pin versions
pip install setuptools==18.8.1
pip install wheel==0.29.0
pip install -r test_requirements.txt
npm install -g typescript
npm install -g typescript@1.7.5

# We run coverage tests only on a single build, where COVERAGE=true
if [ x"${COVERAGE}" = x"true" ]; then
Expand Down

0 comments on commit 2f3ce73

Please sign in to comment.