Merge branch 'master' into plotly

holoviz · Sep 23, 2016 · 383c926 · 383c926
2 parents 3efed3e + d457c32
commit 383c926
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,9 +24,9 @@ install:
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
-  - conda create -q -c scitools -n test-environment python=$TRAVIS_PYTHON_VERSION scipy numpy freetype nose matplotlib bokeh pandas jupyter ipython=4.2.0 param iris xarray pyqt=4.11
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION scipy numpy freetype nose bokeh pandas jupyter ipython=4.2.0 param matplotlib=1.5.1 xarray
   - source activate test-environment
-  - conda install -q -c conda-forge plotly
+  - conda install -c conda-forge  -c scitools iris sip=4.18 plotly
   - if [[ "$TRAVIS_PYTHON_VERSION" == "3.4" ]]; then
       conda install python=3.4.3;
     fi

diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
@@ -110,7 +110,7 @@ def get_data(self, element, ranges, style):
         dims = element.dimensions()
         xs, ys = (element.dimension_values(i) for i in range(2))
         yerr = element.array(dimensions=dims[2:4])
-        style['yerr'] = yerr.T if len(dims) > 3 else yerr
+        style['yerr'] = yerr.T if len(dims) > 3 else yerr[:, 0]
         return (xs, ys), style, {}
 
 

diff --git a/tests/testplotinstantiation.py b/tests/testplotinstantiation.py
@@ -9,7 +9,8 @@
 from holoviews import (Dimension, Overlay, DynamicMap, Store,
                        NdOverlay, GridSpace)
 from holoviews.element import (Curve, Scatter, Image, VLine, Points,
-                               HeatMap, QuadMesh, Spikes, Scatter3D)
+                               HeatMap, QuadMesh, Spikes, ErrorBars,
+                               Scatter3D)
 from holoviews.element.comparison import ComparisonTestCase
 from holoviews.streams import PositionXY
 
@@ -80,6 +81,12 @@ def test_dynamic_streams_refresh(self):
         post = mpl_renderer(plot, fmt='png')
         self.assertNotEqual(pre, post)
 
+    def test_errorbar_test(self):
+        errorbars = ErrorBars(([0,1],[1,2],[0.1,0.2]))
+        plot = mpl_renderer.get_plot(errorbars)
+        plot.initialize_plot()
+
+
 
 class TestBokehPlotInstantiation(ComparisonTestCase):