apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-06-02 14:45:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Max Zwiessele 2015-09-18 17:54:53 +01:00
commit db18b6a4a8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/conf.py
View file

@ -94,8 +94,8 @@ extensions = ['sphinx.ext.autodoc',
'sphinx.ext.viewcode', 'sphinx.ext.viewcode',
#'sphinx.ext.pngmath', #'sphinx.ext.pngmath',
'sphinx.ext.mathjax', 'sphinx.ext.mathjax',
'ipython_directive', # 'ipython_directive',
'ipython_console_highlighting' # 'ipython_console_highlighting'
#'matplotlib.sphinxext.plot_directive' #'matplotlib.sphinxext.plot_directive'
] ]
plot_formats = [('png', 80), ('pdf', 50)] plot_formats = [('png', 80), ('pdf', 50)]
@ -132,7 +132,7 @@ class Mock(object):
#import mock #import mock
print "Mocking" print "Mocking"
MOCK_MODULES = ['sympy', MOCK_MODULES = ['sympy', 'scipy', 'scipy.linalg', 'scipy.linalg.lapack', 'scipy.special', 'scipy.io', 'scipy.integrate', 'scipy.linalg', 'scipy.linalg.cython_blas', 'scipy.optimize',
'sympy.utilities', 'sympy.utilities.codegen', 'sympy.core.cache', 'sympy.utilities', 'sympy.utilities.codegen', 'sympy.core.cache',
'sympy.core', 'sympy.parsing', 'sympy.parsing.sympy_parser', 'Tango', 'numdifftools' 'sympy.core', 'sympy.parsing', 'sympy.parsing.sympy_parser', 'Tango', 'numdifftools'
] ]