Get travis working properly again

This commit is contained in:
Matt Martz 2017-11-23 10:18:16 -06:00
parent f70cc86222
commit 5fbe593fc8
1 changed files with 8 additions and 3 deletions

View File

@ -8,6 +8,8 @@ addons:
- python2.4 - python2.4
- python2.5 - python2.5
- python2.6 - python2.6
- python3.2
- python3.3
matrix: matrix:
include: include:
@ -21,9 +23,9 @@ matrix:
env: TOXENV=py26 env: TOXENV=py26
- python: 2.7 - python: 2.7
env: TOXENV=py27 env: TOXENV=py27
- python: 3.2 - python: 2.7
env: TOXENV=py32 env: TOXENV=py32
- python: 3.3 - python: 2.7
env: TOXENV=py33 env: TOXENV=py33
- python: 3.4 - python: 3.4
env: TOXENV=py34 env: TOXENV=py34
@ -34,8 +36,11 @@ matrix:
- python: pypy - python: pypy
env: TOXENV=pypy env: TOXENV=pypy
before_install:
- if [[ $(echo "$TOXENV" | egrep -c "py35") != 0 ]]; then pyenv global system 3.5; fi;
install: install:
- if [[ $(echo "$TOXENV" | egrep -c "py32") != 0 ]]; then pip install setuptools==17.1.1; fi - if [[ $(echo "$TOXENV" | egrep -c "py32") != 0 ]]; then pip install setuptools==17.1.1; fi;
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[12])") != 0 ]]; then pip install virtualenv==1.7.2 tox==1.3; fi; - if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[12])") != 0 ]]; then pip install virtualenv==1.7.2 tox==1.3; fi;
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[12])") == 0 ]]; then pip install tox; fi; - if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[12])") == 0 ]]; then pip install tox; fi;