Merge branch 'master' of github.com:SheffieldML/GPy

This commit is contained in:
Ricardo Andrade 2013-02-08 14:19:36 +00:00
commit 232376ca73
2 changed files with 3 additions and 5 deletions

View file

@ -10,7 +10,7 @@ from parameterised import parameterised, truncate_pad
import priors import priors
from ..util.linalg import jitchol from ..util.linalg import jitchol
from ..inference import optimization from ..inference import optimization
from .. import likelihoods from GPy import likelihoods
class model(parameterised): class model(parameterised):
def __init__(self): def __init__(self):

View file

@ -103,7 +103,6 @@ class Mock(object):
else: else:
return Mock() return Mock()
#sys.path.append("../GPy")
#import mock #import mock
print "Mocking" print "Mocking"
@ -115,10 +114,9 @@ for mod_name in MOCK_MODULES:
# ----------------------- READTHEDOCS ------------------ # ----------------------- READTHEDOCS ------------------
on_rtd = os.environ.get('READTHEDOCS', None) == 'True' on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
import GPy
if on_rtd: if on_rtd:
sys.path.append("../GPy") sys.path.insert(0, os.getcwd() + "/../GPy")
#sys.path.append("../GPy")
os.system("pwd") os.system("pwd")
os.system("sphinx-apidoc -f -o . ../GPy") os.system("sphinx-apidoc -f -o . ../GPy")
#os.system("cd ..") #os.system("cd ..")