Merge branch 'devel' of github.com:SheffieldML/GPy into devel

.coveragerc

@@ -1,8 +1,8 @@
 # .coveragerc to control coverage.py
 [run]
 branch = True
-source = paramz
-omit = ./paramz/tests/*.py, travis_tests.py, setup.py, ./paramz/__version__.py
+source = GPy
+omit = ./GPy/testing/*.py, travis_tests.py, setup.py, ./GPy/__version__.py
 
 [report]
 # Regexes for lines to exclude from consideration

.travis.yml

@@ -60,6 +60,11 @@ before_deploy:
   - sphinx-apidoc -o source/ ../GPy
   - make html
   - cd ../
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; 
+      then export DIST='register sdist';
+    elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; 
+      then export DIST='bdist_wheel';
+    fi;
 
 deploy:
   provider: pypi
@@ -68,7 +73,7 @@ deploy:
     secure: "vMEOlP7DQhFJ7hQAKtKC5hrJXFl5BkUt4nXdosWWiw//Kg8E+PPLg88XPI2gqIosir9wwgtbSBBbbwCxkM6uxRNMpoNR8Ixyv9fmSXp4rLl7bbBY768W7IRXKIBjpuEy2brQjoT+CwDDSzUkckHvuUjJDNRvUv8ab4P/qYO1LG4="
   on:
     tags: false
-    branch: paramz
+    branch: devel
   server: https://testpypi.python.org/pypi
-  distributions: "bdist_wheel sdist"
+  distributions: $DIST
   skip_cleanup: true

GPy/__version__.py

@@ -1 +1 @@
-__version__ = "0.8.21"
+__version__ = "0.8.30"

README.md

@@ -2,11 +2,11 @@
 
 The Gaussian processes framework in Python.
 
-* [GPy homepage](http://sheffieldml.github.io/GPy/)
-* [Tutorial notebooks](http://nbviewer.ipython.org/github/SheffieldML/notebook/blob/master/GPy/index.ipynb)
-* [User mailing list](https://lists.shef.ac.uk/sympa/subscribe/gpy-users)
-* [Developer documentation](http://gpy.readthedocs.org/en/devel/)
-* [Unit tests (Travis-CI)](https://travis-ci.org/SheffieldML/GPy)
+* GPy [homepage](http://sheffieldml.github.io/GPy/)
+* Tutorial [notebooks](http://nbviewer.ipython.org/github/SheffieldML/notebook/blob/master/GPy/index.ipynb)
+* User [mailing-list](https://lists.shef.ac.uk/sympa/subscribe/gpy-users)
+* Developer [documentation](http://gpy.readthedocs.org/en/devel/)
+* Travis-CI [unit-tests](https://travis-ci.org/SheffieldML/GPy)
 * [![licence](https://img.shields.io/badge/licence-BSD-blue.svg)](http://opensource.org/licenses/BSD-3-Clause) 
 
 ## Updated Structure
@@ -27,8 +27,8 @@ again, in the GPy installation folder.
 
 |      | Travis-CI | Codecov | RTFD |
 | ---: | :--: | :---: | :---: |
-| **master:** | [![master](https://travis-ci.org/SheffieldML/GPy.svg?branch=master)](https://travis-ci.org/SheffieldML/GPy) | [![codecovmaster](http://codecov.io/github/SheffieldML/GPy/coverage.svg?branch=master)](http://codecov.io/github/SheffieldML/GPy?branch=master) | [![docmaster](https://readthedocs.org/projects/gpy/badge/?version=master)](http://gpy.readthedocs.org/en/master/) | 
-| **devel:**  | [![devel](https://travis-ci.org/SheffieldML/GPy.svg?branch=devel)](https://travis-ci.org/SheffieldML/GPy) | [![codecovdevel](http://codecov.io/github/SheffieldML/GPy/coverage.svg?branch=devel)](http://codecov.io/github/SheffieldML/GPy?branch=devel) | [![docdevel](https://readthedocs.org/projects/gpy/badge/?version=devel)](http://gpy.readthedocs.org/en/devel/) | 
+| **master:** | [![masterstat](https://travis-ci.org/SheffieldML/GPy.svg?branch=master)](https://travis-ci.org/SheffieldML/GPy) | [![covmaster](http://codecov.io/github/SheffieldML/GPy/coverage.svg?branch=master)](http://codecov.io/github/SheffieldML/GPy?branch=master) | [![docmaster](https://readthedocs.org/projects/gpy/badge/?version=master)](http://gpy.readthedocs.org/en/master/) | 
+| **devel:**  | [![develstat](https://travis-ci.org/SheffieldML/GPy.svg?branch=devel)](https://travis-ci.org/SheffieldML/GPy) | [![covdevel](http://codecov.io/github/SheffieldML/GPy/coverage.svg?branch=devel)](http://codecov.io/github/SheffieldML/GPy?branch=devel) | [![docdevel](https://readthedocs.org/projects/gpy/badge/?version=devel)](http://gpy.readthedocs.org/en/devel/) | 
 
 ## Supported Platforms:
 

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.21
+current_version = 0.8.30
 tag = True
 commit = True
 

setup.py

@@ -57,7 +57,7 @@ def read_to_rst(fname):
     except ImportError:
         return read(fname)
 
-read_to_rst('README.md')
+desc = read_to_rst('README.md')
 
 version_dummy = {}
 exec(read('GPy/__version__.py'), version_dummy)
@@ -139,7 +139,7 @@ setup(name = 'GPy',
       include_package_data = True,
       py_modules = ['GPy.__init__'],
       test_suite = 'GPy.testing',
-      long_description='https://github.com/SheffieldML/GPy',
+      long_description=desc,
       install_requires=['numpy>=1.7', 'scipy>=0.16', 'six', 'paramz'],
       extras_require = {'docs':['sphinx'],
                         'optional':['mpi4py',