From 377cc383be80852416a630d35d48e3c860cd7425 Mon Sep 17 00:00:00 2001 From: Alan Saul Date: Fri, 18 Jan 2013 12:39:54 +0000 Subject: [PATCH 1/3] Added apt-get scipy installation for travis, need to ensure version --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 921cf083..af20bec4 100644 --- a/.travis.yml +++ b/.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 From 1a795227dff689f0b3cee9de0ffca365074319a7 Mon Sep 17 00:00:00 2001 From: Alan Saul Date: Fri, 18 Jan 2013 13:07:14 +0000 Subject: [PATCH 2/3] Removed latent force model fortran code from setup.py from github code --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 076af82c..497429d0 100644 --- a/setup.py +++ b/setup.py @@ -24,8 +24,8 @@ 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'])], + #ext_modules = [Extension(name = 'GPy.kern.lfmUpsilonf2py', + # sources = ['GPy/kern/src/lfmUpsilonf2py.f90'])], install_requires=['numpy>=1.6', 'scipy>=0.9','matplotlib>=1.1'], setup_requires=['sphinx'], cmdclass = {'build_sphinx': BuildDoc}, From f40b31bea72b4864753baccbc61754d705c20d60 Mon Sep 17 00:00:00 2001 From: Alan Saul Date: Fri, 18 Jan 2013 13:33:49 +0000 Subject: [PATCH 3/3] Removed version specification of scipy --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 497429d0..ee44dde0 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ setup(name = 'GPy', 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'], + install_requires=['numpy>=1.6', 'scipy','matplotlib>=1.1'], setup_requires=['sphinx'], cmdclass = {'build_sphinx': BuildDoc}, classifiers=[