Merge pull request #1264 from ioam/mpl2_compat

Final matplotlib 2.0 compatibility fixes
holoviz · Apr 10, 2017 · 55a63f4 · 55a63f4
2 parents 9a0a2fd + dc8000f
commit 55a63f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
@@ -308,7 +308,7 @@ def _set_aspect(self, axes, aspect):
         data_ratio = 1./(ysize/xsize)
         if aspect != 'square':
             data_ratio = data_ratio/aspect
-        axes.set_aspect(data_ratio)
+        axes.set_aspect(float(data_ratio))
 
 
     def _set_axis_limits(self, axis, view, subplots, ranges):

diff --git a/tests/testplotinstantiation.py b/tests/testplotinstantiation.py
@@ -135,10 +135,9 @@ def test_dynamic_streams_refresh(self):
         dmap = DynamicMap(lambda x, y: Points([(x, y)]),
                              kdims=[], streams=[stream])
         plot = mpl_renderer.get_plot(dmap)
-        plot.initialize_plot()
         pre = mpl_renderer(plot, fmt='png')
+        plot.state.set_dpi(72)
         stream.update(x=1, y=1)
-        plot.refresh()
         post = mpl_renderer(plot, fmt='png')
         self.assertNotEqual(pre, post)
 
@@ -156,6 +155,7 @@ def history_callback(x, history=deque(maxlen=10)):
         plot = mpl_renderer.get_plot(dmap)
         mpl_renderer(plot)
         for i in range(20):
+            plot.state.set_dpi(72)
             stream.update(x=i)
         x, y = plot.handles['artist'].get_data()
         self.assertEqual(x, np.arange(10))