Merge branch 'master' of https://github.com/SheffieldML/GPy

.travis.yml

@@ -3,8 +3,7 @@ python:
   - "2.7"
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: 
-  - pip install "scipy>=0.10.1"
-  - pip install "numpy>=1.6.2"
+  - sudo apt-get install python-scipy
   - pip install sphinx
   - pip install . --use-mirrors
 # command to run tests, e.g. python setup.py test

setup.py

@@ -24,9 +24,9 @@ setup(name = 'GPy',
       package_data = {'GPy': ['GPy/examples']},
       py_modules = ['GPy.__init__'],
       long_description=read('README.md'),
-      ext_modules =  [Extension(name = 'GPy.kern.lfmUpsilonf2py',
-                sources = ['GPy/kern/src/lfmUpsilonf2py.f90'])],
-      install_requires=['numpy>=1.6', 'scipy>=0.9','matplotlib>=1.1'],
+      #ext_modules =  [Extension(name = 'GPy.kern.lfmUpsilonf2py',
+      #          sources = ['GPy/kern/src/lfmUpsilonf2py.f90'])],
+      install_requires=['numpy>=1.6', 'scipy','matplotlib>=1.1'],
       setup_requires=['sphinx'],
       cmdclass = {'build_sphinx': BuildDoc},
       classifiers=[