Skip to content

Commit

Permalink
Updated bokeh version used on travis (#2561)
Browse files Browse the repository at this point in the history
  • Loading branch information
jlstevens committed Apr 20, 2018
1 parent e477f3b commit e0fa4ad
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -30,7 +30,7 @@ install:
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION flake8 scipy=1.0.0 numpy freetype nose pandas=0.22.0 jupyter ipython=5.4.1 param matplotlib=2.1.2 xarray
- source activate test-environment
- conda install -c conda-forge iris plotly flexx ffmpeg --quiet
- conda install -c bokeh datashader dask bokeh=0.12.14 selenium
- conda install -c bokeh datashader dask bokeh=0.12.15 selenium
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.4" ]]; then
conda install python=3.4.3;
fi
Expand Down
2 changes: 1 addition & 1 deletion conda.recipe/meta.yaml
Expand Up @@ -23,7 +23,7 @@ requirements:
- python
- param >=1.6.0,<2.0
- numpy
- matplotlib
- matplotlib>=2.1
- bokeh>=0.12.14,<=0.12.15
- jupyter
- notebook
Expand Down
2 changes: 2 additions & 0 deletions holoviews/plotting/bokeh/hex_tiles.py
@@ -1,3 +1,5 @@
from __future__ import division

import param
import numpy as np

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -17,7 +17,7 @@
extras_require['notebook-dependencies'] = ['ipython', 'pyzmq', 'jinja2', 'tornado',
'jsonschema', 'notebook', 'pygments']
# IPython Notebook + matplotlib
extras_require['recommended'] = extras_require['notebook-dependencies'] + ['matplotlib', 'bokeh>=0.12.14,<=0.12.15']
extras_require['recommended'] = extras_require['notebook-dependencies'] + ['matplotlib>=2.1', 'bokeh>=0.12.15']
# Additional, useful third-party packages
extras_require['extras'] = (['pandas', 'seaborn']
+ extras_require['recommended'])
Expand Down
8 changes: 1 addition & 7 deletions tests/testbokehcallbacks.py
Expand Up @@ -12,7 +12,7 @@
from holoviews.plotting.bokeh.util import bokeh_version

from bokeh.events import Tap
from bokeh.models import Range1d, Plot, ColumnDataSource
from bokeh.models import Range1d, Plot
bokeh_renderer = Store.renderers['bokeh']
except:
bokeh_renderer = None
Expand Down Expand Up @@ -81,12 +81,6 @@ def test_server_callback_resolve_attr_spec_range1d_end(self):
msg = Callback.resolve_attr_spec('x_range.attributes.end', range1d)
self.assertEqual(msg, {'id': range1d.ref['id'], 'value': 10})

def test_server_callback_resolve_attr_spec_source_selected(self):
source = ColumnDataSource()
source.selected['1d']['indices'] = [1, 2, 3]
msg = Callback.resolve_attr_spec('cb_obj.selected.1d.indices', source)
self.assertEqual(msg, {'id': source.ref['id'], 'value': [1, 2, 3]})

def test_server_callback_resolve_attr_spec_tap_event(self):
plot = Plot()
event = Tap(plot, x=42)
Expand Down

0 comments on commit e0fa4ad

Please sign in to comment.