From 21d210b8ce36e30425beab1baaae9a1385cb602e Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Tue, 24 Feb 2015 18:03:19 +0000 Subject: [PATCH 1/2] Travis: quicker "install" --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d790e94f9..ec069438d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,14 @@ before_install: > travis_retry sudo apt-get install python python-setuptools python-virtualenv python-dev gcc swig dialog libaugeas0 libssl-dev -install: - - travis_retry python setup.py dev # installs tox - - travis_retry pip install coveralls - -script: travis_retry tox +install: "travis_retry pip install tox coveralls" +script: "travis_retry tox" after_success: coveralls +# using separate envs with different TOXENVs creates 4x1 Travis build +# matrix, which allows us to clearly distinguish which component under +# test has failed env: - TOXENV=py26 - TOXENV=py27 From 05ac2bde9a4915c4543db32fd0b6ef4cf161d564 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Tue, 24 Feb 2015 18:12:26 +0000 Subject: [PATCH 2/2] travis: install libffi-dev --- .travis.yml | 2 ++ docs/using.rst | 1 + 2 files changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index ec069438d..a968acaa6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: python +# please keep this in sync with docs/using.rst (Ubuntu section, apt-get) before_install: > travis_retry sudo apt-get install python python-setuptools python-virtualenv python-dev gcc swig dialog libaugeas0 libssl-dev + libffi-dev ca-certificates install: "travis_retry pip install tox coveralls" script: "travis_retry tox" diff --git a/docs/using.rst b/docs/using.rst index d5b008670..53ecb000c 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -27,6 +27,7 @@ Ubuntu gcc swig dialog libaugeas0 libssl-dev libffi-dev \ ca-certificates +.. Please keep the above command in sync with .travis.yml (before_install) Mac OSX -------