From aeaa3918220d137fee300935625def0324c4dae3 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Thu, 14 Nov 2019 10:53:25 -0600 Subject: [PATCH 1/4] Do not link HoloViews plots where shared_axes=False --- panel/pane/holoviews.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/pane/holoviews.py b/panel/pane/holoviews.py index c956ba4619..ff1c66a0e4 100644 --- a/panel/pane/holoviews.py +++ b/panel/pane/holoviews.py @@ -520,7 +520,7 @@ def link_axes(root_view, root_model): if ref not in pane._plots: continue plot = pane._plots[ref][0] - if not pane.linked_axes or plot.renderer.backend != 'bokeh': + if not pane.linked_axes or plot.renderer.backend != 'bokeh' or not plot.shared_axes: continue for p in plot.traverse(specs=[ElementPlot]): if p.current_frame is None: From f8ceb63b56c9ac49f89d16f3a24f4d6148046bc2 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Thu, 14 Nov 2019 10:57:06 -0600 Subject: [PATCH 2/4] Fixed options lookup --- panel/pane/holoviews.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/pane/holoviews.py b/panel/pane/holoviews.py index ff1c66a0e4..415280ecb0 100644 --- a/panel/pane/holoviews.py +++ b/panel/pane/holoviews.py @@ -112,7 +112,7 @@ def _update_layout(self): else: try: opts = Store.lookup_options(backend, self.object, 'plot').kwargs - except KeyError: + except: opts = {} responsive_modes = ('stretch_width', 'stretch_both', 'scale_width', 'scale_both') center = self.center From f14cfb8b0449721f2a2461f47a0d6ccb5d80249f Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Thu, 14 Nov 2019 11:06:15 -0600 Subject: [PATCH 3/4] Dropped bokeh dev channel --- .appveyor.yml | 2 +- .travis.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a65948cc25..ea178c9076 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,6 @@ environment: global: - CHANS_DEV: "-c pyviz/label/dev -c bokeh/label/dev -c conda-forge" + CHANS_DEV: "-c pyviz/label/dev -c bokeh -c conda-forge" matrix: - PY: "3.6" CONDA: "C:\\Miniconda36-x64" diff --git a/.travis.yml b/.travis.yml index 6e437ded91..fdd82e47a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ addons: env: global: - PYENV_VERSION=3.7 - - CHANS_DEV="-c pyviz/label/dev -c bokeh/label/dev -c conda-forge" - - CHANS_REL="-c pyviz -c conda-forge" + - CHANS_DEV="-c pyviz/label/dev -c bokeh -c conda-forge" + - CHANS_REL="-c pyviz -c bokeh -c conda-forge" - LABELS_DEV="--label dev" - LABELS_REL="--label dev --label main" - PKG_TEST_PYTHON="--test-python=py36" From 9e5515fcf24a43545b0adde8c058979bbc468b53 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Thu, 14 Nov 2019 11:42:00 -0600 Subject: [PATCH 4/4] Fixed shared_axes --- panel/pane/holoviews.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/panel/pane/holoviews.py b/panel/pane/holoviews.py index 415280ecb0..0f00814e99 100644 --- a/panel/pane/holoviews.py +++ b/panel/pane/holoviews.py @@ -520,7 +520,8 @@ def link_axes(root_view, root_model): if ref not in pane._plots: continue plot = pane._plots[ref][0] - if not pane.linked_axes or plot.renderer.backend != 'bokeh' or not plot.shared_axes: + if (not pane.linked_axes or plot.renderer.backend != 'bokeh' + or not getattr(plot, 'shared_axes', False)): continue for p in plot.traverse(specs=[ElementPlot]): if p.current_frame is None: