Merge pull request #1074 from ThomasWaldmann/travis-trusty

Travis using ubuntu trusty
This commit is contained in:
TW 2016-07-06 20:50:57 +02:00 committed by GitHub
commit a1f8a23ca7
2 changed files with 7 additions and 4 deletions

View File

@ -6,19 +6,24 @@ cache:
directories: directories:
- $HOME/.cache/pip - $HOME/.cache/pip
# note: use py 3.5.2, it has lzma support. 3.5(.0) on travis.org/trusty does not.
matrix: matrix:
include: include:
- python: 3.4 - python: 3.4
os: linux os: linux
dist: trusty
env: TOXENV=py34 env: TOXENV=py34
- python: 3.5 - python: 3.5.2
os: linux os: linux
dist: trusty
env: TOXENV=py35 env: TOXENV=py35
- python: nightly - python: nightly
os: linux os: linux
dist: trusty
env: TOXENV=py36 env: TOXENV=py36
- python: 3.5 - python: 3.4
os: linux os: linux
dist: trusty
env: TOXENV=flake8 env: TOXENV=flake8
- language: generic - language: generic
os: osx os: osx

View File

@ -32,8 +32,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
python -m pip install --user 'virtualenv<14.0' python -m pip install --user 'virtualenv<14.0'
else else
pip install 'virtualenv<14.0' pip install 'virtualenv<14.0'
sudo add-apt-repository -y ppa:gezakovacs/lz4
sudo apt-get update
sudo apt-get install -y liblz4-dev sudo apt-get install -y liblz4-dev
sudo apt-get install -y libacl1-dev sudo apt-get install -y libacl1-dev
fi fi