Merge branch 'master' into devel

AUTHORS.txt

@@ -1,8 +1,3 @@
-James Hensman
-Nicolo Fusi
-Ricardo Andrade
-Nicolas Durrande
-Alan Saul
-Max Zwiessele
-Neil D. Lawrence
-Zhenwen Dai
+# This list was out of date, I've put "see contributors" for the moment. Not sure how to fix long term but don't want to be 
+# embarrassed by some off the great contributors of late being omitted from a list.
+See contributors.

GPy/inference/mcmc/samplers.py

@@ -41,7 +41,7 @@ class Metropolis_Hastings:
                    self.model._log_det_jacobian()
         accepted = np.zeros(Ntotal,dtype=np.bool)
         for it in range(Ntotal):
-            print "sample %d of %d\r"%(it,Ntotal),
+            print("sample %d of %d\r"%(it,Ntotal),end="\t")
             sys.stdout.flush()
             prop = np.random.multivariate_normal(current, self.cov*self.scale*self.scale)
             self.model.optimizer_array = prop

README.md

@@ -14,10 +14,10 @@ Continuous integration status: ![CI status](https://travis-ci.org/SheffieldML/GP
 ### Citation
 
     @Misc{gpy2014,
-      author =   {The GPy authors},
+      author =   {{The GPy authors}},
       title =    {{GPy}: A Gaussian process framework in python},
       howpublished = {\url{http://github.com/SheffieldML/GPy}},
-      year = {2012--2014}
+      year = {2012--2015}
     }
 
 ### Pronounciation
@@ -69,14 +69,6 @@ The command `python3 setup.py build_ext --inplace` builds the Cython extensions.
 * All weave functions not covered by the test suite are *simply commented out*. Can add equivalents later as test functions become available
 * A set of benchmarks would be useful! 
 
-### Citation
-
-    @Misc{gpy2014,
-      author =   {The GPy authors},
-      title =    {{GPy}: A Gaussian process framework in python},
-      howpublished = {\url{http://github.com/SheffieldML/GPy}},
-      year = {2012--2014}
-    }
 
 ### Pronounciation
 
@@ -165,15 +157,12 @@ Current support for the GPy software is coming through the following projects.
 
 * [EU FP7-PEOPLE Project Ref 316861](http://staffwww.dcs.shef.ac.uk/people/N.Lawrence/projects/mlpm/) "MLPM2012: Machine Learning for Personalized Medicine"
 
-* [BBSRC Project No BB/K011197/1](http://staffwww.dcs.shef.ac.uk/people/N.Lawrence/projects/recombinant/) "Linking recombinant gene sequence to protein product manufacturability using CHO cell genomic resources"
-
 * MRC Special Training Fellowship "Bayesian models of expression in the transcriptome for clinical RNA-seq"
 
-* [EU FP7-KBBE Project Ref 289434](http://staffwww.dcs.shef.ac.uk/people/N.Lawrence/projects/biopredyn/) "From Data to Models: New Bioinformatics Methods and Tools for Data-Driven Predictive Dynamic Modelling in Biotechnological Applications"
-
 *  [EU FP7-ICT Project Ref 612139](http://staffwww.dcs.shef.ac.uk/people/N.Lawrence/projects/wysiwyd/) "WYSIWYD: What You Say is What You Did"
 
 Previous support for the GPy software came from the following projects:
-
+* [BBSRC Project No BB/K011197/1](http://staffwww.dcs.shef.ac.uk/people/N.Lawrence/projects/recombinant/) "Linking recombinant gene sequence to protein product manufacturability using CHO cell genomic resources"
+* [EU FP7-KBBE Project Ref 289434](http://staffwww.dcs.shef.ac.uk/people/N.Lawrence/projects/biopredyn/) "From Data to Models: New Bioinformatics Methods and Tools for Data-Driven Predictive Dynamic Modelling in Biotechnological Applications"
 * [BBSRC Project No BB/H018123/2](http://staffwww.dcs.shef.ac.uk/people/N.Lawrence/projects/iterative/) "An iterative pipeline of computational modelling and experimental design for uncovering gene regulatory networks in vertebrates"
 * [Erasysbio](http://staffwww.dcs.shef.ac.uk/people/N.Lawrence/projects/synergy/) "SYNERGY: Systems approach to gene regulation biology through nuclear receptors"

setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, Extension
 import numpy as np
 
 # Version number
-version = '0.6.1'
+version = '0.8'
 
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()