tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3671 from dnephin/fix_pip_version_osx 

Update pip in travis osx build
This commit is contained in:
Aanand Prasad 2016-07-05 16:08:51 -07:00 committed by GitHub
parent edd3637b9b 3d0a1de023
commit 967dce5807
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/travis/ci
View File

@ -6,5 +6,5 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
tox -e py27,py34 -- tests/unit tox -e py27,py34 -- tests/unit
else else
# TODO: we could also install py34 and test against it # TODO: we could also install py34 and test against it
python -m tox -e py27 -- tests/unit tox -e py27 -- tests/unit
fi fi

3
script/travis/install
View File

@ -5,5 +5,6 @@ set -ex
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
pip install tox==2.1.1 pip install tox==2.1.1
else else
pip install --user tox==2.1.1 sudo pip install --upgrade pip tox==2.1.1 virtualenv
pip --version
fi fi