nouislider pr merge conflict resolution

jupyter-widgets · Feb 8, 2020 · 4dab951 · 4dab951
1 parent 8fbc773
commit 4dab951
Show file tree

Hide file tree

Showing 8 changed files with 750 additions and 318 deletions.
diff --git a/ipywidgets/widgets/widget_float.py b/ipywidgets/widgets/widget_float.py
@@ -166,7 +166,7 @@ class FloatSlider(_BoundedFloat):
     """
     _view_name = Unicode('FloatSliderView').tag(sync=True)
     _model_name = Unicode('FloatSliderModel').tag(sync=True)
-    step = CFloat(0.1, help="Minimum step to increment the value").tag(sync=True)
+    step = CFloat(0.1, allow_none=True, help="Minimum step to increment the value").tag(sync=True)
     orientation = CaselessStrEnum(values=['horizontal', 'vertical'],
         default_value='horizontal', help="Vertical or horizontal.").tag(sync=True)
     readout = Bool(True, help="Display the current value of the slider next to it.").tag(sync=True)
@@ -207,7 +207,7 @@ class FloatLogSlider(_BoundedLogFloat):
     """
     _view_name = Unicode('FloatLogSliderView').tag(sync=True)
     _model_name = Unicode('FloatLogSliderModel').tag(sync=True)
-    step = CFloat(0.1, help="Minimum step in the exponent to increment the value").tag(sync=True)
+    step = CFloat(0.1, allow_none=True, help="Minimum step in the exponent to increment the value").tag(sync=True)
     orientation = CaselessStrEnum(values=['horizontal', 'vertical'],
         default_value='horizontal', help="Vertical or horizontal.").tag(sync=True)
     readout = Bool(True, help="Display the current value of the slider next to it.").tag(sync=True)
@@ -350,7 +350,7 @@ class FloatRangeSlider(_BoundedFloatRange):
     """
     _view_name = Unicode('FloatRangeSliderView').tag(sync=True)
     _model_name = Unicode('FloatRangeSliderModel').tag(sync=True)
-    step = CFloat(0.1, help="Minimum step to increment the value").tag(sync=True)
+    step = CFloat(0.1, allow_none=True, help="Minimum step to increment the value").tag(sync=True)
     orientation = CaselessStrEnum(values=['horizontal', 'vertical'],
         default_value='horizontal', help="Vertical or horizontal.").tag(sync=True)
     readout = Bool(True, help="Display the current value of the slider next to it.").tag(sync=True)