Merge branch 'master' into devel

GPy/plotting/__init__.py

@@ -4,4 +4,8 @@
 try:
     from . import matplot_dep
 except (ImportError, NameError):
-    print('Fail to load GPy.plotting.matplot_dep.')
+    # Matplotlib not available
+    import warnings
+    warnings.warn(ImportWarning("Matplotlib not available, install newest version of Matplotlib for plotting"))
+    #sys.modules['matplotlib'] =
+    #sys.modules[__name__+'.matplot_dep'] = ImportWarning("Matplotlib not available, install newest version of Matplotlib for plotting")

GPy/plotting/matplot_dep/Tango.py

@@ -3,7 +3,7 @@
 
 
 import matplotlib as mpl
-import pylab as pb
+from matplotlib import pyplot as pb
 import sys
 #sys.path.append('/home/james/mlprojects/sitran_cluster/')
 #from switch_pylab_backend import *
@@ -159,7 +159,7 @@ cdict_Alu = {'red' :((0./5,colorsRGB['Aluminium1'][0]/256.,colorsRGB['Aluminium1
 # cmap_BGR = mpl.colors.LinearSegmentedColormap('TangoRedBlue',cdict_BGR,256)
 # cmap_RB = mpl.colors.LinearSegmentedColormap('TangoRedBlue',cdict_RB,256)
 if __name__=='__main__':
-    import pylab as pb
+    from matplotlib import pyplot as pb
     pb.figure()
     pb.pcolor(pb.rand(10,10),cmap=cmap_RB)
     pb.colorbar()

GPy/plotting/matplot_dep/base_plots.py

@@ -4,7 +4,7 @@
 
 try:
     #import Tango
-    import pylab as pb
+    from matplotlib import pyplot as pb
 except:
     pass
 import numpy as np

GPy/plotting/matplot_dep/inference_plots.py

@@ -2,7 +2,7 @@
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 try:
-    import pylab as pb
+    from matplotlib import pyplot as pb
 except:
     pass
 #import numpy as np

GPy/plotting/matplot_dep/kernel_plots.py

@@ -2,7 +2,7 @@
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 import numpy as np
-import pylab as pb
+from matplotlib import pyplot as pb
 import Tango
 from matplotlib.textpath import TextPath
 from matplotlib.transforms import offset_copy

GPy/plotting/matplot_dep/mapping_plots.py

@@ -4,7 +4,7 @@
 import numpy as np
 try:
     import Tango
-    import pylab as pb
+    from matplotlib import pyplot as pb
 except:
     pass
 from base_plots import x_frame1D, x_frame2D

GPy/plotting/matplot_dep/maps.py

@@ -2,7 +2,7 @@
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 import numpy as np
 try:
-    import pylab as pb
+    from matplotlib import pyplot as pb
     from matplotlib.patches import Polygon
     from matplotlib.collections import PatchCollection
     #from matplotlib import cm

GPy/plotting/matplot_dep/priors_plots.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 try:
-    import pylab as pb
+    from matplotlib import pyplot as pb
 except:
     pass
 

GPy/plotting/matplot_dep/svig_plots.py

@@ -2,7 +2,7 @@
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 import numpy as np
-import pylab as pb
+from matplotlib import pyplot as pb
 
 
 def plot(model, ax=None, fignum=None, Z_height=None, **kwargs):

GPy/plotting/matplot_dep/variational_plots.py

@@ -1,4 +1,4 @@
-import pylab as pb, numpy as np
+from matplotlib import pyplot as pb, numpy as np
 
 def plot(parameterized, fignum=None, ax=None, colors=None, figsize=(12, 6)):
     """