Skip to content

Commit

Permalink
More flake fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jlstevens committed Jun 14, 2023
1 parent 1f5a791 commit 2430ae4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions holoviews/plotting/bokeh/element.py
Original file line number Diff line number Diff line change
Expand Up @@ -562,11 +562,11 @@ def _init_plot(self, key, element, plots, ranges=None):
fig = figure(title=title, **properties)

multi_ax = 'x' if self.invert_axes else 'y'
for dim, range_obj in properties.get(f'extra_{multi_ax}_ranges', {}).items():
axis_type, axis_label, _ = axis_specs[multi_ax][dim]
ax_cls, ax_kwargs = _get_axis_class(axis_type, range_obj, dim=1)
ax_kwargs[f'{multi_ax}_range_name'] = dim
fig.add_layout(ax_cls(axis_label=axis_label, **ax_kwargs), yaxes[dim])
for axis_dim, range_obj in properties.get(f'extra_{multi_ax}_ranges', {}).items():
axis_type, axis_label, _ = axis_specs[multi_ax][axis_dim]
ax_cls, ax_kwargs = _get_axis_class(axis_type, range_obj, axis_dim=1)
ax_kwargs[f'{multi_ax}_range_name'] = axis_dim
fig.add_layout(ax_cls(axis_label=axis_label, **ax_kwargs), yaxes[axis_dim])
return fig

def _plot_properties(self, key, element):
Expand Down Expand Up @@ -846,9 +846,9 @@ def _update_ranges(self, element, ranges):
# ALERT: extra ranges need shared, logx, and stream handling
streaming, log, shared = False, False, False
multi_dim = 'x' if self.invert_axes else 'y'
for dim, extra_y_range in self.handles[f'extra_{multi_dim}_ranges'].items():
_, b, _, t = self.get_extents(element, ranges, dimension=dim)
factors = self._get_dimension_factors(element, ranges, dim)
for axis_dim, extra_y_range in self.handles[f'extra_{multi_dim}_ranges'].items():
_, b, _, t = self.get_extents(element, ranges, dimension=axis_dim)
factors = self._get_dimension_factors(element, ranges, axis_dim)
self._update_range(
extra_y_range, b, t, factors, self.invert_yaxis,
shared, log, streaming
Expand Down
2 changes: 1 addition & 1 deletion holoviews/plotting/plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ def _has_axis_dimension(self, element, dimension):
dimension in ds if isinstance(ds, list) else dimension == ds
for ds in dims
)

def _get_frame(self, key):
if isinstance(self.hmap, DynamicMap) and self.overlaid and self.current_frame:
self.current_key = key
Expand Down

0 comments on commit 2430ae4

Please sign in to comment.