From 88d90f28a6fbb75c4da0e28eb1858399f6e9eb91 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Tue, 29 Mar 2016 14:11:22 +0100 Subject: [PATCH 1/7] Make sure cov matrix is positive-semidefinite Fixes a numpy warning. The old matrix was positive-semidefinite according to the old check in numpy but it seems this has changed a bit --- examples/api/power_norm_demo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/api/power_norm_demo.py b/examples/api/power_norm_demo.py index dc0b9103bc6a..76ada2370df3 100755 --- a/examples/api/power_norm_demo.py +++ b/examples/api/power_norm_demo.py @@ -5,7 +5,7 @@ import numpy as np from numpy.random import multivariate_normal -data = np.vstack([multivariate_normal([10, 10], [[2, 2], [2, 2]], size=100000), +data = np.vstack([multivariate_normal([10, 10], [[3, 2], [2, 3]], size=100000), multivariate_normal([30, 20], [[2, 3], [1, 3]], size=1000) ]) From bae3a10027e19418199edd04cd1887a7073a593c Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Tue, 29 Mar 2016 15:39:57 +0100 Subject: [PATCH 2/7] Image slice example: make sure ind is an integer --- examples/pylab_examples/image_slices_viewer.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/examples/pylab_examples/image_slices_viewer.py b/examples/pylab_examples/image_slices_viewer.py index cf90e18e100e..5f8c79f52fba 100644 --- a/examples/pylab_examples/image_slices_viewer.py +++ b/examples/pylab_examples/image_slices_viewer.py @@ -1,6 +1,6 @@ from __future__ import print_function import numpy -from matplotlib.pyplot import figure, show +import matplotlib.pyplot as plt class IndexTracker(object): @@ -10,7 +10,7 @@ def __init__(self, ax, X): self.X = X rows, cols, self.slices = X.shape - self.ind = self.slices/2 + self.ind = int(self.slices/2) self.im = ax.imshow(self.X[:, :, self.ind]) self.update() @@ -18,10 +18,9 @@ def __init__(self, ax, X): def onscroll(self, event): print("%s %s" % (event.button, event.step)) if event.button == 'up': - self.ind = numpy.clip(self.ind + 1, 0, self.slices - 1) + self.ind = int(numpy.clip(self.ind + 1, 0, self.slices - 1)) else: - self.ind = numpy.clip(self.ind - 1, 0, self.slices - 1) - + self.ind = int(numpy.clip(self.ind - 1, 0, self.slices - 1)) self.update() def update(self): @@ -30,8 +29,7 @@ def update(self): self.im.axes.figure.canvas.draw() -fig = figure() -ax = fig.add_subplot(111) +fig, ax = plt.subplots(1, 1) X = numpy.random.rand(20, 20, 40) @@ -39,4 +37,4 @@ def update(self): fig.canvas.mpl_connect('scroll_event', tracker.onscroll) -show() +plt.show() From d0f5abf0395909837ebcbc9cef56476be4331550 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Tue, 29 Mar 2016 15:40:22 +0100 Subject: [PATCH 3/7] Centered ticklabels: make sure index is an int --- examples/pylab_examples/centered_ticklabels.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pylab_examples/centered_ticklabels.py b/examples/pylab_examples/centered_ticklabels.py index c8489906d1d3..43313721f5c7 100644 --- a/examples/pylab_examples/centered_ticklabels.py +++ b/examples/pylab_examples/centered_ticklabels.py @@ -45,6 +45,6 @@ tick.tick2line.set_markersize(0) tick.label1.set_horizontalalignment('center') -imid = len(r)/2 +imid = int(len(r)/2) ax.set_xlabel(str(r.date[imid].year)) plt.show() From aaa3216db70d93e5581925dd4753b881ddeecb05 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Tue, 29 Mar 2016 15:54:46 +0100 Subject: [PATCH 4/7] Stock_demo data_helper ensure indices are ints before using numpy --- examples/pylab_examples/data_helper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/pylab_examples/data_helper.py b/examples/pylab_examples/data_helper.py index 291a6dc44813..dbd01144cdca 100755 --- a/examples/pylab_examples/data_helper.py +++ b/examples/pylab_examples/data_helper.py @@ -17,10 +17,10 @@ def get_two_stock_data(): file2 = cbook.get_sample_data('AAPL.dat.gz') M1 = fromstring(file1.read(), ' Date: Tue, 29 Mar 2016 15:56:01 +0100 Subject: [PATCH 5/7] Quiver_demo cast indices to int before indexing numpy array --- examples/pylab_examples/quiver_demo.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/examples/pylab_examples/quiver_demo.py b/examples/pylab_examples/quiver_demo.py index 49205ccae282..4f3cd6791ebf 100644 --- a/examples/pylab_examples/quiver_demo.py +++ b/examples/pylab_examples/quiver_demo.py @@ -75,8 +75,13 @@ # 6 plt.figure() M = np.zeros(U.shape, dtype='bool') -M[U.shape[0]/3:2*U.shape[0]/3, - U.shape[1]/3:2*U.shape[1]/3] = True +XMaskStart = int(U.shape[0]/3) +YMaskStart = int(U.shape[1]/3) +XMaskStop = int(2*U.shape[0]/3) +YMaskStop = int(2*U.shape[1]/3) + +M[XMaskStart:XMaskStop, + YMaskStart:YMaskStop] = True U = ma.masked_array(U, mask=M) V = ma.masked_array(V, mask=M) Q = plt.quiver(U, V) From 58a27bf4979dd991ee58756b4ff957fd62af9575 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Tue, 29 Mar 2016 14:14:37 +0100 Subject: [PATCH 6/7] Dont forward trim argument to ticker where it has no effect --- lib/mpl_toolkits/axisartist/grid_finder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/mpl_toolkits/axisartist/grid_finder.py b/lib/mpl_toolkits/axisartist/grid_finder.py index 5f882d697ac2..db9157ac5204 100644 --- a/lib/mpl_toolkits/axisartist/grid_finder.py +++ b/lib/mpl_toolkits/axisartist/grid_finder.py @@ -255,14 +255,14 @@ def __init__(self, class MaxNLocator(mticker.MaxNLocator): - def __init__(self, nbins = 10, steps = None, - trim = True, + def __init__(self, nbins=10, steps=None, + trim=True, integer=False, symmetric=False, prune=None): - + # trim argument has no effect. It has been left for API compatibility mticker.MaxNLocator.__init__(self, nbins, steps=steps, - trim=trim, integer=integer, + integer=integer, symmetric=symmetric, prune=prune) self.create_dummy_axis() self._factor = None From d82de883d4c91ca8ff23bfdfe24744593e3c50bb Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Wed, 30 Mar 2016 09:47:53 +0100 Subject: [PATCH 7/7] Use floordiv as sugested by QuLogic --- examples/pylab_examples/centered_ticklabels.py | 2 +- examples/pylab_examples/data_helper.py | 4 ++-- examples/pylab_examples/image_slices_viewer.py | 6 +++--- examples/pylab_examples/quiver_demo.py | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/pylab_examples/centered_ticklabels.py b/examples/pylab_examples/centered_ticklabels.py index 43313721f5c7..e745acf965bc 100644 --- a/examples/pylab_examples/centered_ticklabels.py +++ b/examples/pylab_examples/centered_ticklabels.py @@ -45,6 +45,6 @@ tick.tick2line.set_markersize(0) tick.label1.set_horizontalalignment('center') -imid = int(len(r)/2) +imid = len(r)//2 ax.set_xlabel(str(r.date[imid].year)) plt.show() diff --git a/examples/pylab_examples/data_helper.py b/examples/pylab_examples/data_helper.py index dbd01144cdca..27a9cef06dda 100755 --- a/examples/pylab_examples/data_helper.py +++ b/examples/pylab_examples/data_helper.py @@ -17,10 +17,10 @@ def get_two_stock_data(): file2 = cbook.get_sample_data('AAPL.dat.gz') M1 = fromstring(file1.read(), '