Merge branch 'devel' of github.com:/sheffieldml/GPy into devel

.travis.yml

@@ -2,14 +2,14 @@ language: python
 python:
   - "2.7"
 
-#Set virtual env with system-site-packages to true
-virtualenv:
-  system_site_packages: true
-
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-before_install: 
-  - sudo apt-get install -qq python-scipy python-pip
-  - sudo apt-get install -qq python-matplotlib
+before_install:
+  #Install a mini version of anaconda such that we can easily install our dependencies
+  - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+  - chmod +x miniconda.sh
+  - ./miniconda.sh -b
+  - export PATH=/home/travis/miniconda/bin:$PATH
+  - conda update --yes conda
   # Workaround for a permissions issue with Travis virtual machine images
   # that breaks Python's multiprocessing:
   # https://github.com/travis-ci/travis-cookbooks/issues/155
@@ -17,10 +17,10 @@ before_install:
   - sudo ln -s /run/shm /dev/shm
 
 install:
-  - pip install --upgrade numpy==1.7.1 
-  - pip install sphinx 
-  - pip install nose
-  - pip install . --use-mirrors
+  - conda install --yes python=$TRAVIS_PYTHON_VERSION atlas numpy=1.7 scipy=0.12 matplotlib nose sphinx pip nose
+  - pip install . 
+  #--use-mirrors
+  #
 # command to run tests, e.g. python setup.py test
 script: 
   - nosetests GPy/testing