From 8f88243b0d9b60dd6fcff610af8fbe2eac7b35d7 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Thu, 6 Apr 2017 20:51:14 +0100 Subject: [PATCH 1/3] Updated travis to use bokeh 0.12.5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a8a75a47c2..590d320607 100644 --- a/.travis.yml +++ b/.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 From 550b8544313167e7c7f12b84aa837ced9eb37565 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Thu, 6 Apr 2017 21:04:06 +0100 Subject: [PATCH 2/3] Updated bokeh unit tests for bokeh 0.12.5 --- tests/testplotinstantiation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testplotinstantiation.py b/tests/testplotinstantiation.py index 2d0bf8c5d4..c86b8996b6 100644 --- a/tests/testplotinstantiation.py +++ b/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)}, From 17cab670d4d636605ebd92f03f26fbf43a4c4d29 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Thu, 6 Apr 2017 21:05:04 +0100 Subject: [PATCH 3/3] Updated doc/nb_publisher submodule reference --- doc/nbpublisher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/nbpublisher b/doc/nbpublisher index 4759e32897..7f21f0f3bd 160000 --- a/doc/nbpublisher +++ b/doc/nbpublisher @@ -1 +1 @@ -Subproject commit 4759e32897bf7821f844a0ede68ba144bb268498 +Subproject commit 7f21f0f3bd60b235e6e21b0b0f0d165d8b32e8e6