From af3210396e9ff67b03f4729688642a086866596c Mon Sep 17 00:00:00 2001 From: Alan Saul Date: Fri, 8 Feb 2013 16:04:26 +0000 Subject: [PATCH] Fixed the fecking subpackage... --- doc/conf.py | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index c3c9cde8..0c26700c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -39,11 +39,11 @@ except ImportError: parent = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) sys.path.insert(0, parent) -sys.path.append(parent) +#sys.path.append(parent) -parent = os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'GPy')) -sys.path.insert(0, parent) -sys.path.append(parent) +#parent = os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'GPy')) +#sys.path.insert(0, parent) +#sys.path.append(parent) #APP_DIR = os.path.normpath(os.path.join(os.getcwd(), '../')) #PACKAGE_DIR1 = os.path.normpath(os.path.join(os.getcwd(), '../')) diff --git a/setup.py b/setup.py index 1aa2f0f0..acebd624 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ setup(name = 'GPy', license = "BSD 3-clause", keywords = "machine-learning gaussian-processes kernels", url = "http://ml.sheffield.ac.uk/GPy/", - packages = ['GPy', 'GPy.core', 'GPy.kern', 'GPy.util', 'GPy.models', 'GPy.inference', 'GPy.examples'], + packages = ['GPy', 'GPy.core', 'GPy.kern', 'GPy.util', 'GPy.models', 'GPy.inference', 'GPy.examples', 'GPy.likelihoods'], package_dir={'GPy': 'GPy'}, package_data = {'GPy': ['GPy/examples']}, py_modules = ['GPy.__init__'],