apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-07-20 16:51:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #842 from jbect/fix-scipy-dependency

Browse source 
Fix scipy depency problem
This commit is contained in:
Neil Lawrence 2020-06-18 12:16:25 +01:00 • committed by GitHub
commit 4ced6146fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -93,7 +93,7 @@ We like to pronounce it 'g-pie'.
## Getting started: installing with pip ## Getting started: installing with pip
We are now requiring the newest version (0.16) of We are requiring a recent version (1.3.0 or later) of
[scipy](http://www.scipy.org/) and thus, we strongly recommend using [scipy](http://www.scipy.org/) and thus, we strongly recommend using
the [anaconda python distribution](http://continuum.io/downloads). the [anaconda python distribution](http://continuum.io/downloads).
With anaconda you can install GPy by the following: With anaconda you can install GPy by the following:
@ -111,7 +111,7 @@ And finally,
pip install gpy pip install gpy
We've also had luck with [enthought](http://www.enthought.com). Install scipy 0.16 (or later) We've also had luck with [enthought](http://www.enthought.com). Install scipy 1.3.0 (or later)
and then pip install GPy: and then pip install GPy:
pip install gpy pip install gpy

7
setup.py
View file

@ -117,6 +117,11 @@ try:
except ModuleNotFoundError: except ModuleNotFoundError:
ext_mods = [] ext_mods = []
install_requirements = ['numpy>=1.7', 'six', 'paramz>=0.9.0', 'cython>=0.29']
if sys.version_info < (3, 6):
install_requirements += ['scipy>=1.3.0,<1.5.0']
else:
install_requirements += ['scipy>=1.3.0']
setup(name = 'GPy', setup(name = 'GPy',
version = __version__, version = __version__,
@ -164,7 +169,7 @@ setup(name = 'GPy',
py_modules = ['GPy.__init__'], py_modules = ['GPy.__init__'],
test_suite = 'GPy.testing', test_suite = 'GPy.testing',
setup_requires = ['numpy>=1.7'], setup_requires = ['numpy>=1.7'],
install_requires = ['numpy>=1.7', 'scipy>=1.3.0', 'six', 'paramz>=0.9.0', 'cython>=0.29'], install_requires = install_requirements,
extras_require = {'docs':['sphinx'], extras_require = {'docs':['sphinx'],
'optional':['mpi4py', 'optional':['mpi4py',
'ipython>=4.0.0', 'ipython>=4.0.0',