Merge pull request #1246 from ioam/bokeh_travis_update

Bokeh travis update

.travis.yml

@@ -27,7 +27,7 @@ install:
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
-  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION scipy=0.18.1 numpy freetype nose bokeh=0.12.3 pandas jupyter ipython=4.2.0 param pyqt=4 matplotlib=1.5.1 xarray datashader dask=0.13
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION scipy=0.18.1 numpy freetype nose bokeh=0.12.5 pandas jupyter ipython=4.2.0 param pyqt=4 matplotlib=1.5.1 xarray datashader dask=0.13
   - source activate test-environment
   - conda install -c conda-forge  -c scitools iris sip=4.18 plotly flexx
   - if [[ "$TRAVIS_PYTHON_VERSION" == "3.4" ]]; then

tests/testplotinstantiation.py

@@ -438,7 +438,7 @@ def test_batched_path_line_width_and_color(self):
         self.assertEqual(plot.handles['source'].data['line_width'], line_width)
         self.assertEqual(plot.handles['source'].data['color'], color)
 
-    def _test_hover_info(self, element, tooltips, line_policy='prev'):
+    def _test_hover_info(self, element, tooltips, line_policy='nearest'):
         plot = bokeh_renderer.get_plot(element)
         plot.initialize_plot()
         fig = plot.state
@@ -461,7 +461,7 @@ def test_curve_overlay_hover_batched(self):
         opts = {'Curve': {'tools': ['hover']},
                 'NdOverlay': {'legend_limit': 0}}
         obj = obj(plot=opts)
-        self._test_hover_info(obj, [('Test', '@Test')])
+        self._test_hover_info(obj, [('Test', '@Test')], 'prev')
 
     def test_curve_overlay_hover(self):
         obj = NdOverlay({i: Curve(np.random.rand(10,2)) for i in range(5)},