From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 4 Jul 2014 12:52:15 +0000 (+0200)
Subject: fix:(travis): try install numexpr with pip
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a253a852dbe77aa270acef95499944bbba42fb80;p=timeside-diadems.git

fix:(travis): try install numexpr with pip
---

diff --git a/.travis.yml b/.travis.yml
index 177b6d9..7b62104 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,10 @@ virtualenv:
 # command to prepare the system to install prerequisites or dependencies
 before_install:
  - sudo add-apt-repository -y ppa:donk/gstreamer
- - sudo add-apt-repository -y ppa:bradner-computation/pipeline  # because numexpr packages is too old in Ubuntu repository 
  - 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 numexpr  # python-numexpr from ppa::a.valentino/eotools
  - sudo apt-get install -qq python-gst0.10 gstreamer0.10-plugins-good gstreamer0.10-gnonlin gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad
 
 # command to install dependencies
diff --git a/setup.py b/setup.py
index 96607b4..703b29a 100755
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,7 @@ setup(
         'mutagen',
         'pillow',
         'h5py',
+        'numexpr>=2.0.0'
         'tables',
         'pyyaml',
         'simplejson',