From 735d058a8dcc85c32d3bf95ffa716ab442be2e5a Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 21 May 2016 19:29:04 +0200 Subject: [PATCH] travis: use ubuntu trusty beta infrastructure (not: precise) use python 3.5.2 on trusty travis-ci machines their 3.5(.0) misses lzma support at the moment. after this is fixed, we likely want to go back to 3.5(.0) to run the tests. --- .travis.yml | 9 +++++++-- .travis/install.sh | 2 -- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c9dfaea81..853ad5414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,19 +6,24 @@ cache: directories: - $HOME/.cache/pip +# note: use py 3.5.2, it has lzma support. 3.5(.0) on travis.org/trusty does not. matrix: include: - python: 3.4 os: linux + dist: trusty env: TOXENV=py34 - - python: 3.5 + - python: 3.5.2 os: linux + dist: trusty env: TOXENV=py35 - python: nightly os: linux + dist: trusty env: TOXENV=py36 - - python: 3.5 + - python: 3.4 os: linux + dist: trusty env: TOXENV=flake8 - language: generic os: osx diff --git a/.travis/install.sh b/.travis/install.sh index 6ae408992..1f86ee387 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -32,8 +32,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then python -m pip install --user 'virtualenv<14.0' else 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 libacl1-dev fi