Skip to content

Commit

Permalink
Don't autoimport FigureWidget unless ipywidgets is installed and >= 7…
Browse files Browse the repository at this point in the history
….0.0 (#1425)

* Don't autoimport FigureWidget unless ipywidgets is installed and >= 7.0.0
* Remove LooseVersion and ipywidgets from graph_objs namespace
  • Loading branch information
jonmmease authored Feb 4, 2019
1 parent 385854d commit 63c8ecf
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
7 changes: 5 additions & 2 deletions codegen/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,13 @@ def perform_codegen():
optional_figure_widget_import = """
try:
import ipywidgets
from ._figurewidget import FigureWidget
from distutils.version import LooseVersion
if LooseVersion(ipywidgets.__version__) >= LooseVersion('7.0.0'):
from ._figurewidget import FigureWidget
del LooseVersion
del ipywidgets
except ImportError:
pass
"""
root_datatype_imports.append(optional_figure_widget_import)

Expand Down
1 change: 1 addition & 0 deletions plotly/basewidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from .serializers import custom_serializers
from .version import __frontend_version__


@widgets.register
class BaseFigureWidget(BaseFigure, widgets.DOMWidget):
"""
Expand Down
7 changes: 5 additions & 2 deletions plotly/graph_objs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,13 @@

try:
import ipywidgets
from ._figurewidget import FigureWidget
from distutils.version import LooseVersion
if LooseVersion(ipywidgets.__version__) >= LooseVersion('7.0.0'):
from ._figurewidget import FigureWidget
del LooseVersion
del ipywidgets
except ImportError:
pass

from ._deprecations import (
Data, Annotations, Frames, AngularAxis, Annotation, ColorBar, Contours,
ErrorX, ErrorY, ErrorZ, Font, Legend, Line, Margin, Marker, RadialAxis,
Expand Down

0 comments on commit 63c8ecf

Please sign in to comment.