Merge branch 'dev' of github.com:Parisson/TimeSide into dev

Author: yomguy

.travis.yml

@@ -1,24 +1,32 @@
 language: python
 python:
   - "2.7"
+  
+sudo: required
 
-virtualenv:
-  system_site_packages: true
+services:
+  - docker
 
 env:
   - TEST_TARGET=default  # Default unit test
   - TEST_TARGET=cli      # Test for TimeSide command line interfaces
   - TEST_TARGET=doc      # Test documentation and included doctest
   - TEST_TARGET=server   # Test timeside.server
 
+env:
+  DOCKER_COMPOSE_VERSION: 1.5.2
+
+before_install:
+  - docker-compose --version
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
+  - docker-compose --version
+
 
 # Install TimeSide
 install:
-  - sudo apt-get install -y linux-image-virtual linux-image-extra-virtual
-  - curl -sSL https://get.docker.com/ | sudo sh
-  - sudo pip install docker-compose
-  #- pip install --upgrade pip
-  #- pip install -r requirements.txt
   - docker-compose -f docker-compose.yml -f conf/build.yml build
 
 

environment-pinned.yml

@@ -10,7 +10,7 @@ dependencies:
 - h5py=2.5.0=np110py27_4
 - hdf5=1.8.15.1=2
 - ipykernel=4.2.2=py27_0
-- ipython=4.0.3=py27_0
+- ipython=4.1.1=py27_0
 - ipython_genutils=0.1.0=py27_0
 - ipywidgets=4.1.1=py27_0
 - jbig=2.1=0
@@ -29,13 +29,13 @@ dependencies:
 - markupsafe=0.23=py27_0
 - matplotlib=1.5.1=np110py27_0
 - mistune=0.7.1=py27_0
+- mkl=11.3.1=0
 - nbconvert=4.1.0=py27_0
 - nbformat=4.0.1=py27_0
 - networkx=1.11=py27_0
 - notebook=4.1.0=py27_0
-- numexpr=2.4.6=np110py27_0
-- numpy=1.10.2=py27_0
-- openblas=0.2.14=3
+- numexpr=2.4.6=np110py27_1
+- numpy=1.10.4=py27_0
 - openssl=1.0.2f=0
 - path.py=8.1.2=py27_1
 - pexpect=3.3=py27_0
@@ -58,7 +58,7 @@ dependencies:
 - qtconsole=4.1.1=py27_0
 - readline=6.2=2
 - redis=2.6.9=0
-- scipy=0.17.0=np110py27_0
+- scipy=0.17.0=np110py27_1
 - setuptools=19.6.2=py27_0
 - simplegeneric=0.8.1=py27_0
 - simplejson=3.8.1=py27_0
@@ -90,7 +90,7 @@ dependencies:
   - django-angular==0.7.15
   - django-bootstrap-pagination==1.5.1
   - django-bootstrap3==6.2.2
-  - django-bower==5.0.4
+  - django-bower==5.1.0
   - django-celery==3.1.17
   - django-environ==0.4.0
   - django-extensions==1.6.1