From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 15 May 2014 09:32:51 +0000 (+0200)
Subject: Fix Travis CI setuptools support
X-Git-Tag: 0.5.5~1^2~24^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b98a1e7b12f90cb1572008106fabb3640f25d922;p=timeside.git

Fix Travis CI setuptools support

Add  "sudo apt-get install python-setuptools" to .travis.yml 'befor_install' scripts otherwise Travis CI virtualenv with system_site_packages = true causes a conflict between setuptools (in virtualenv) and distutils in /usr/lib
---

diff --git a/.travis.yml b/.travis.yml
index 24e2433..5e0720a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ virtualenv:
 before_install:
  - sudo add-apt-repository -y ppa:donk/gstreamer
  - sudo apt-get -qq update
+ - sudo apt-get install python-setuptools
  - sudo apt-get install -qq python-numpy python-scipy python-matplotlib
  - sudo apt-get install -qq libhdf5-serial-dev python-h5py
  - sudo apt-get install -qq libatlas-dev libatlas-base-dev gfortran