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

.travis.yml

@@ -1,11 +1,20 @@
 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
+before_install: 
+  - sudo apt-get install -qq python-scipy python-pip
+  - 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 --with-xcoverage --with-xunit --cover-package=GPy --cover-erase GPy/testing
+  - nosetests GPy/testing

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)

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)