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

This commit is contained in:
Zhenwen Dai 2014-11-03 12:18:11 +00:00
commit 78be1464be

View file

@ -14,7 +14,6 @@ import examples
import likelihoods import likelihoods
import testing import testing
from numpy.testing import Tester from numpy.testing import Tester
from nose.tools import nottest
import kern import kern
import plotting import plotting
@ -22,10 +21,16 @@ import plotting
from core import Model from core import Model
from core.parameterization import Param, Parameterized, ObsAr from core.parameterization import Param, Parameterized, ObsAr
@nottest #@nottest
def tests(): try:
Tester(testing).test(verbose=10) #Get rid of nose dependency by only ignoring if you have nose installed
from nose.tools import nottest
@nottest
def tests():
Tester(testing).test(verbose=10)
except:
def tests():
Tester(testing).test(verbose=10)
def load(file_path): def load(file_path):
""" """
@ -36,4 +41,4 @@ def load(file_path):
import cPickle as pickle import cPickle as pickle
with open(file_path, 'rb') as f: with open(file_path, 'rb') as f:
m = pickle.load(f) m = pickle.load(f)
return m return m