Skip to content

Commit

Permalink
Fixed flakes
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Dec 6, 2018
1 parent 30e10b7 commit 31cb6ee
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions holoviews/plotting/bokeh/element.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from bokeh.document.events import ModelChangedEvent
from bokeh.models import tools
from bokeh.models import (
HoverTool, Renderer, Range1d, DataRange1d, Title, FactorRange,
FuncTickFormatter, Legend, TickFormatter, PrintfTickFormatter)
Renderer, Range1d, DataRange1d, Title, FactorRange, Legend,
FuncTickFormatter, TickFormatter, PrintfTickFormatter)
from bokeh.models.tickers import Ticker, BasicTicker, FixedTicker, LogTicker
from bokeh.models.widgets import Panel, Tabs
from bokeh.models.mappers import LinearColorMapper
Expand Down
1 change: 0 additions & 1 deletion holoviews/plotting/bokeh/plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from bokeh.layouts import gridplot
from bokeh.models import (ColumnDataSource, Column, Row, Div)
from bokeh.models.widgets import Panel, Tabs
from bokeh.plotting.helpers import _known_tools as known_tools

from ...core import (OrderedDict, Store, AdjointLayout, NdLayout, Layout,
Empty, GridSpace, HoloMap, Element, DynamicMap)
Expand Down
4 changes: 2 additions & 2 deletions holoviews/tests/plotting/bokeh/testelementplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def test_active_tools_scroll(self):
toolbar = plot.state.toolbar
self.assertIsInstance(toolbar.active_scroll, tools.WheelZoomTool)

def test_active_tools_scroll(self):
def test_active_tools_tap(self):
curve = Curve([1, 2, 3]).options(active_tools=['tap'], tools=['tap'])
plot = bokeh_renderer.get_plot(curve)
toolbar = plot.state.toolbar
Expand Down Expand Up @@ -418,7 +418,7 @@ def test_active_tools_scroll(self):
toolbar = plot.state.toolbar
self.assertIsInstance(toolbar.active_scroll, tools.WheelZoomTool)

def test_active_tools_scroll(self):
def test_active_tools_tap(self):
curve = Curve([1, 2, 3])
scatter = Scatter([1, 2, 3]).options(tools=['tap'])
overlay = (scatter * curve).options(active_tools=['tap'])
Expand Down

0 comments on commit 31cb6ee

Please sign in to comment.