From cd0363cbeeb1b3d8ba8aa626620f14cf3d39b830 Mon Sep 17 00:00:00 2001 From: Alan Saul Date: Fri, 8 Feb 2013 14:07:32 +0000 Subject: [PATCH 1/3] Moved GPy import --- doc/conf.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index ed7e5f65..91599d1b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -103,7 +103,6 @@ class Mock(object): else: return Mock() -#sys.path.append("../GPy") #import mock print "Mocking" @@ -115,10 +114,9 @@ for mod_name in MOCK_MODULES: # ----------------------- READTHEDOCS ------------------ on_rtd = os.environ.get('READTHEDOCS', None) == 'True' -import GPy - if on_rtd: sys.path.append("../GPy") + import GPy os.system("pwd") os.system("sphinx-apidoc -f -o . ../GPy") #os.system("cd ..") From 915d8fc25ac8b1594e54b7c249b61bae4e1f21d3 Mon Sep 17 00:00:00 2001 From: Alan Saul Date: Fri, 8 Feb 2013 14:12:18 +0000 Subject: [PATCH 2/3] Adding more paths...: --- doc/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 91599d1b..69fde65e 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -115,8 +115,8 @@ for mod_name in MOCK_MODULES: on_rtd = os.environ.get('READTHEDOCS', None) == 'True' if on_rtd: - sys.path.append("../GPy") - import GPy + sys.path.insert(0, os.getcwd() + "/../GPy") + #sys.path.append("../GPy") os.system("pwd") os.system("sphinx-apidoc -f -o . ../GPy") #os.system("cd ..") From 9e7f33d6f14c7fbd8d7dc5acc163fe63ff705be9 Mon Sep 17 00:00:00 2001 From: Alan Saul Date: Fri, 8 Feb 2013 14:19:29 +0000 Subject: [PATCH 3/3] Just testing an absolute import --- GPy/core/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPy/core/model.py b/GPy/core/model.py index a0628c42..3ac8d622 100644 --- a/GPy/core/model.py +++ b/GPy/core/model.py @@ -10,7 +10,7 @@ from parameterised import parameterised, truncate_pad import priors from ..util.linalg import jitchol from ..inference import optimization -from .. import likelihoods +from GPy import likelihoods class model(parameterised): def __init__(self):