Skip to content

Commit

Permalink
bump glue-jupyter
Browse files Browse the repository at this point in the history
which in turn requires a bump to glue-core
  • Loading branch information
kecnry committed Dec 7, 2023
1 parent a86e698 commit 0dda475
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
13 changes: 3 additions & 10 deletions jdaviz/configs/default/plugins/plot_options/plot_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@

__all__ = ['PlotOptions']

GLUE_LT_1_17 = not minversion("glue", "1.17")


class SplineStretch:
"""
Expand Down Expand Up @@ -92,10 +90,7 @@ def update_knots(self, x, y):

# Add the spline stretch to the glue stretch registry if not registered
if "spline" not in stretches:
if GLUE_LT_1_17:
stretches.add("spline", SplineStretch(), display="Spline")
else:
stretches.add("spline", SplineStretch, display="Spline")
stretches.add("spline", SplineStretch, display="Spline")


@tray_registry('g-plot-options', label="Plot Options")
Expand Down Expand Up @@ -852,10 +847,8 @@ def _update_stretch_curve(self, msg=None):
# procedure in glue's CompositeArray:
interval = ManualInterval(self.stretch_vmin_value, self.stretch_vmax_value)
contrast_bias = ContrastBiasStretch(self.image_contrast_value, self.image_bias_value)
if GLUE_LT_1_17:
stretch = stretches.members[self.stretch_function_value]
else:
stretch = stretches.members[self.stretch_function_value]()
stretch = layer.state.stretch_object

layer_cmap = layer.state.cmap

# show the colorbar
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dependencies = [
"traitlets>=5.0.5",
"bqplot>=0.12.37",
"bqplot-image-gl>=1.4.11",
"glue-core>=1.16.0",
"glue-jupyter>=0.19",
"glue-core>=1.17.1",
"glue-jupyter>=0.20",
"echo>=0.5.0",
"ipykernel>=6.19.4",
"ipyvue>=1.6",
Expand Down

0 comments on commit 0dda475

Please sign in to comment.