From ce5b9ee81a1077be2384fcd418f133b6fd64bc06 Mon Sep 17 00:00:00 2001
From: Nicolo Fusi <nicolo.fusi@gmail.com>
Date: Thu, 31 Jan 2013 11:15:38 +0000
Subject: [PATCH 1/4] convenience change in linear.py

---
 GPy/kern/linear.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/GPy/kern/linear.py b/GPy/kern/linear.py
index 89e87314..d36e40b7 100644
--- a/GPy/kern/linear.py
+++ b/GPy/kern/linear.py
@@ -28,6 +28,9 @@ class linear(kernpart):
             self.Nparam = 1
             self.name = 'linear'
             if variances is not None:
+                if isinstance(variances, float):
+                    variances = np.array([variances])
+                    
                 assert variances.shape == (1,)
             else:
                 variances = np.ones(1)

From 43261b601f16f0d6ea4184badd3216c7efe5652a Mon Sep 17 00:00:00 2001
From: Nicolo Fusi <nicolo.fusi@gmail.com>
Date: Thu, 31 Jan 2013 13:38:24 +0000
Subject: [PATCH 2/4] making travis-ci work again

---
 .travis.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index af20bec4..5c654d37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,12 @@
 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
-install: 
-  - sudo apt-get install python-scipy
-  - pip install sphinx
-  - pip install . --use-mirrors
-# command to run tests, e.g. python setup.py test
-script: 
-  - nosetests --with-xcoverage --with-xunit --cover-package=GPy --cover-erase GPy/testing
+before_install: 
+  - sudo apt-get install -qq python-scipy python-pip
+  - sudo apt-get install -qq python-matplotlib
\ No newline at end of file

From 169f5fead9df60189cbe149bd3122732df44fb03 Mon Sep 17 00:00:00 2001
From: Nicolo Fusi <nicolo.fusi@gmail.com>
Date: Thu, 31 Jan 2013 13:41:06 +0000
Subject: [PATCH 3/4] useless commit to get travis-ci started

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c69352b8..0b5d00ce 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 GPy
 ===
 
-A Gaussian processes framework in python.
+A Gaussian processes framework in python
 
 * [Online documentation](https://gpy.readthedocs.org/en/latest/)
 * [Unit tests (Travis-CI)](https://travis-ci.org/SheffieldML/GPy)
\ No newline at end of file

From 4998317b7a36c8fc9ad6348d88c5e30bbb131b48 Mon Sep 17 00:00:00 2001
From: Nicolo Fusi <nicolo.fusi@gmail.com>
Date: Thu, 31 Jan 2013 13:43:37 +0000
Subject: [PATCH 4/4] changed travis conf

---
 .travis.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5c654d37..e7944d8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,4 +9,12 @@ virtualenv:
 # 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
\ No newline at end of file
+  - sudo apt-get install -qq python-matplotlib
+
+install:
+  - pip install sphinx 
+  - pip install nose
+  - pip install . --use-mirrors
+# command to run tests, e.g. python setup.py test
+script: 
+  - nosetests GPy/testing
\ No newline at end of file