mirror of
https://github.com/SheffieldML/GPy.git
synced 2026-05-15 06:52:39 +02:00
Merge pull request #236 from SheffieldML/master
sync up master and devel
This commit is contained in:
commit
f619eb236c
3 changed files with 11 additions and 3 deletions
|
|
@ -1 +1 @@
|
||||||
__version__ = "0.8.1"
|
__version__ = "0.8.2"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 0.8.1
|
current_version = 0.8.2
|
||||||
tag = True
|
tag = True
|
||||||
commit = True
|
commit = True
|
||||||
|
|
||||||
|
|
|
||||||
10
setup.py
10
setup.py
|
|
@ -9,6 +9,14 @@ import numpy as np
|
||||||
def read(fname):
|
def read(fname):
|
||||||
return open(os.path.join(os.path.dirname(__file__), fname)).read()
|
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 = {}
|
version_dummy = {}
|
||||||
exec(read('GPy/__version__.py'), version_dummy)
|
exec(read('GPy/__version__.py'), version_dummy)
|
||||||
__version__ = version_dummy['__version__']
|
__version__ = version_dummy['__version__']
|
||||||
|
|
@ -79,7 +87,7 @@ setup(name = 'GPy',
|
||||||
include_package_data = True,
|
include_package_data = True,
|
||||||
py_modules = ['GPy.__init__'],
|
py_modules = ['GPy.__init__'],
|
||||||
test_suite = 'GPy.testing',
|
test_suite = 'GPy.testing',
|
||||||
long_description=read('README.md'),
|
long_description=read_to_rst('README.md'),
|
||||||
install_requires=['numpy>=1.7', 'scipy>=0.16'],
|
install_requires=['numpy>=1.7', 'scipy>=0.16'],
|
||||||
extras_require = {'docs':['matplotlib >=1.3','Sphinx','IPython']},
|
extras_require = {'docs':['matplotlib >=1.3','Sphinx','IPython']},
|
||||||
classifiers=['License :: OSI Approved :: BSD License',
|
classifiers=['License :: OSI Approved :: BSD License',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue