Merge pull request #236 from SheffieldML/master

sync up master and devel

GPy/__version__.py

@@ -1 +1 @@
-__version__ = "0.8.1"
+__version__ = "0.8.2"

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.1
+current_version = 0.8.2
 tag = True
 commit = True
 

setup.py

@@ -9,6 +9,14 @@ import numpy as np
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
+def read_to_rst(fname):
+    try:
+        import pypandoc
+        print 'Warning in installation: For rst formatting in pypi, consider installing pypandoc for conversion'
+        return pypandoc.convert('README.md', 'rst')
+    except:
+        return read(fname)
+
 version_dummy = {}
 exec(read('GPy/__version__.py'), version_dummy)
 __version__ = version_dummy['__version__']
@@ -79,7 +87,7 @@ setup(name = 'GPy',
       include_package_data = True,
       py_modules = ['GPy.__init__'],
       test_suite = 'GPy.testing',
-      long_description=read('README.md'),
+      long_description=read_to_rst('README.md'),
       install_requires=['numpy>=1.7', 'scipy>=0.16'],
       extras_require = {'docs':['matplotlib >=1.3','Sphinx','IPython']},
       classifiers=['License :: OSI Approved :: BSD License',