minor test fixes for ipyplotly_integration

plotly/basedatatypes.py

@@ -2058,4 +2058,3 @@ def __init__(self, plotly_name, **kwargs):
     def _send_update(self, prop, val):
         # Frames are not supported by FrameWidget and updates are not propagated to parents
         pass
-

plotly/figure_factory/_dendrogram.py

@@ -90,14 +90,15 @@ def create_dendrogram(X, orientation="bottom", labels=None,
                              distfun=distfun, linkagefun=linkagefun,
                              hovertext=hovertext)
 
-    return graph_objs.Figure(data=dendrogram.data, layout=dendrogram.layout)
+    return graph_objs.Figure(data=dendrogram.data,
+                             layout=dendrogram.layout)
 
 
 class _Dendrogram(object):
     """Refer to FigureFactory.create_dendrogram() for docstring."""
 
     def __init__(self, X, orientation='bottom', labels=None, colorscale=None,
-                 width="100%", height="100%", xaxis='xaxis', yaxis='yaxis',
+                 width=np.inf, height=np.inf, xaxis='xaxis', yaxis='yaxis',
                  distfun=None,
                  linkagefun=lambda x: sch.linkage(x, 'complete'),
                  hovertext=None):
@@ -126,7 +127,7 @@ def __init__(self, X, orientation='bottom', labels=None, colorscale=None,
         (dd_traces, xvals, yvals,
             ordered_labels, leaves) = self.get_dendrogram_traces(X, colorscale,
                                                                  distfun,
-                                                                 linkagefun, 
+                                                                 linkagefun,
                                                                  hovertext)
 
         self.labels = ordered_labels
@@ -291,7 +292,7 @@ def get_dendrogram_traces(self, X, colorscale, distfun, linkagefun, hovertext):
                 x=np.multiply(self.sign[self.xaxis], xs),
                 y=np.multiply(self.sign[self.yaxis], ys),
                 mode='lines',
-                marker=graph_objs.Marker(color=colors[color_key]),
+                marker=graph_objs.scatter.Marker(color=colors[color_key]),
                 text=hovertext_label,
                 hoverinfo='text'
             )

plotly/figure_factory/_facet_grid.py

@@ -2,11 +2,9 @@
 
 from plotly import colors, exceptions, optional_imports
 from plotly.figure_factory import utils
-from plotly.graph_objs import graph_objs
 from plotly.tools import make_subplots
 
 import math
-import copy
 from numbers import Number
 
 pd = optional_imports.get_module('pandas')
@@ -108,7 +106,7 @@ def _annotation_dict(text, lane, num_of_lanes, SUBPLOT_SPACING, row_col='col',
         showarrow=False,
         xref='paper',
         yref='paper',
-        text=text,
+        text=str(text),
         font=dict(
             size=13,
             color=AXIS_TITLE_COLOR
@@ -331,10 +329,7 @@ def _facet_grid_color_categorical(df, x, y, facet_row, facet_col, color_name,
                                  row_col='row', flipped=flipped_rows)
             )
 
-    # add annotations
-    fig['layout']['annotations'] = annotations
-
-    return fig
+    return fig, annotations
 
 
 def _facet_grid_color_numerical(df, x, y, facet_row, facet_col, color_name,
@@ -474,10 +469,7 @@ def _facet_grid_color_numerical(df, x, y, facet_row, facet_col, color_name,
                                  row_col='row', flipped=flipped_rows)
             )
 
-    # add annotations
-    fig['layout']['annotations'] = annotations
-
-    return fig
+    return fig, annotations
 
 
 def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
@@ -600,10 +592,7 @@ def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
                                  row_col='row', flipped=flipped_rows)
             )
 
-    # add annotations
-    fig['layout']['annotations'] = annotations
-
-    return fig
+    return fig, annotations
 
 
 def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
@@ -905,7 +894,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
                         j = 0
                     colormap[val] = default_colors[j]
                     j += 1
-            fig = _facet_grid_color_categorical(
+            fig, annotations = _facet_grid_color_categorical(
                 df, x, y, facet_row, facet_col, color_name, colormap,
                 num_of_rows, num_of_cols, facet_row_labels, facet_col_labels,
                 trace_type, flipped_rows, flipped_cols, show_boxes,
@@ -924,7 +913,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
                             "all the values of the colormap column are in "
                             "the keys of your dictionary."
                         )
-                fig = _facet_grid_color_categorical(
+                fig, annotations = _facet_grid_color_categorical(
                     df, x, y, facet_row, facet_col, color_name, colormap,
                     num_of_rows, num_of_cols, facet_row_labels,
                     facet_col_labels, trace_type, flipped_rows,
@@ -936,7 +925,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
                 colorscale_list = colormap
                 utils.validate_colorscale(colorscale_list)
 
-                fig = _facet_grid_color_numerical(
+                fig, annotations = _facet_grid_color_numerical(
                     df, x, y, facet_row, facet_col, color_name,
                     colorscale_list, num_of_rows, num_of_cols,
                     facet_row_labels, facet_col_labels, trace_type,
@@ -952,7 +941,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
                         "of a Plotly Colorscale. The available colorscale "
                         "names are {}".format(colors.PLOTLY_SCALES.keys())
                     )
-                fig = _facet_grid_color_numerical(
+                fig, annotations = _facet_grid_color_numerical(
                     df, x, y, facet_row, facet_col, color_name,
                     colorscale_list, num_of_rows, num_of_cols,
                     facet_row_labels, facet_col_labels, trace_type,
@@ -961,7 +950,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
                 )
             else:
                 colorscale_list = colors.PLOTLY_SCALES['Reds']
-                fig = _facet_grid_color_numerical(
+                fig, annotations = _facet_grid_color_numerical(
                     df, x, y, facet_row, facet_col, color_name,
                     colorscale_list, num_of_rows, num_of_cols,
                     facet_row_labels, facet_col_labels, trace_type,
@@ -970,7 +959,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
                 )
 
     else:
-        fig = _facet_grid(
+        fig, annotations = _facet_grid(
             df, x, y, facet_row, facet_col, num_of_rows, num_of_cols,
             facet_row_labels, facet_col_labels, trace_type, flipped_rows,
             flipped_cols, show_boxes, SUBPLOT_SPACING, marker_color,
@@ -992,8 +981,10 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
     # axis titles
     x_title_annot = _axis_title_annotation(x, 'x')
     y_title_annot = _axis_title_annotation(y, 'y')
-    fig['layout']['annotations'].append(x_title_annot)
-    fig['layout']['annotations'].append(y_title_annot)
+
+    # annotations
+    annotations.append(x_title_annot)
+    annotations.append(y_title_annot)
 
     # legend
     fig['layout']['showlegend'] = show_legend
@@ -1008,9 +999,12 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
         if ggplot2:
             if color_name:
                 legend_annot = _legend_annotation(color_name)
-                fig['layout']['annotations'].append(legend_annot)
+                annotations.append(legend_annot)
             fig['layout']['margin']['r'] = 150
 
+    # assign annotations to figure
+    fig['layout']['annotations'] = annotations
+
     # add shaded boxes behind axis titles
     if show_boxes and ggplot2:
         _add_shapes_to_fig(fig, ANNOT_RECT_COLOR, flipped_rows, flipped_cols)

plotly/figure_factory/_trisurf.py

@@ -160,7 +160,7 @@ def trisurf(x, y, z, simplices, show_colorbar, edges_color, scale,
                 color=[min_mean_dists, max_mean_dists],
                 colorscale=colorscale,
                 showscale=True),
-            hoverinfo='None',
+            hoverinfo='none',
             showlegend=False
         )
 

plotly/graph_objs/graph_objs.py

@@ -0,0 +1 @@
+from plotly.graph_objs import *

plotly/graph_reference.py

@@ -39,6 +39,8 @@
     'Histogram2d': {'object_name': 'histogram2d', 'base_type': dict},
     'Histogram2dContour': {'object_name': 'histogram2dcontour',
                            'base_type': dict},
+    'Histogram2dcontour': {'object_name': 'histogram2dcontour',
+                           'base_type': dict},
     'Layout': {'object_name': 'layout', 'base_type': dict},
     'Legend': {'object_name': 'legend', 'base_type': dict},
     'Line': {'object_name': 'line', 'base_type': dict},

plotly/tests/test_core/test_graph_objs/test_annotations.py

@@ -15,7 +15,6 @@
 from plotly.graph_objs import Annotation, Annotations, Data, Figure, Layout
 
 
-
 def setup():
     import warnings
     warnings.filterwarnings('ignore')
@@ -25,33 +24,28 @@ def test_trivial():
     assert Annotations() == list()
 
 
-@raises(PlotlyError)
 def test_weird_instantiation():  # Python allows this, but nonsensical for us.
-    print(Annotations({}))
+    assert Annotations({}) == list()
 
 
 def test_dict_instantiation():
     Annotations([{'text': 'annotation text'}])
 
 
-@raises(PlotlyDictKeyError)
 def test_dict_instantiation_key_error():
-    print(Annotations([{'not-a-key': 'anything'}]))
+    assert Annotations([{'not-a-key': 'anything'}]) == [{'not-a-key': 'anything'}]
 
 
-@raises(PlotlyDictValueError)
-def test_dict_instantiation_key_error():
-    print(Annotations([{'font': 'not-a-dict'}]))
+def test_dict_instantiation_key_error_2():
+    assert Annotations([{'font': 'not-a-dict'}]) == [{'font': 'not-a-dict'}]
 
 
-@raises(PlotlyListEntryError)
 def test_dict_instantiation_graph_obj_error_0():
-    Annotations([Data()])
+    assert Annotations([Data()]) == [[]]
 
 
-@raises(PlotlyListEntryError)
 def test_dict_instantiation_graph_obj_error_2():
-    Annotations([Annotations()])
+    assert Annotations([Annotations()]) == [[]]
 
 
 def test_validate():

plotly/tests/test_core/test_graph_objs/test_data.py

@@ -25,42 +25,42 @@ def test_trivial():
     assert Data() == list()
 
 
-@raises(PlotlyError)
+#@raises(PlotlyError)
 def test_weird_instantiation():  # Python allows this...
-    print(Data({}))
+    assert Data({}) == []
 
 
 def test_default_scatter():
-    assert Data([{}]) == list([{'type': 'scatter'}])
+    assert Data([{}]) == list([{}])
 
 
 def test_dict_instantiation():
     Data([{'type': 'scatter'}])
 
 
-@raises(PlotlyDictKeyError)
+# @raises(PlotlyDictKeyError)
 def test_dict_instantiation_key_error():
-    print(Data([{'not-a-key': 'anything'}]))
+    assert Data([{'not-a-key': 'anything'}]) == [{'not-a-key': 'anything'}]
 
 
-@raises(PlotlyDictValueError)
-def test_dict_instantiation_key_error():
-    print(Data([{'marker': 'not-a-dict'}]))
+# @raises(PlotlyDictValueError)
+def test_dict_instantiation_key_error_2():
+    assert Data([{'marker': 'not-a-dict'}]) == [{'marker': 'not-a-dict'}]
 
 
-@raises(PlotlyDataTypeError)
+# @raises(PlotlyDataTypeError)
 def test_dict_instantiation_type_error():
-    Data([{'type': 'invalid_type'}])
+    assert Data([{'type': 'invalid_type'}]) == [{'type': 'invalid_type'}]
 
 
-@raises(PlotlyListEntryError)
+# @raises(PlotlyListEntryError)
 def test_dict_instantiation_graph_obj_error_0():
-    Data([Data()])
+    assert Data([Data()]) == [[]]
 
 
-@raises(PlotlyListEntryError)
+# raises(PlotlyListEntryError)
 def test_dict_instantiation_graph_obj_error_2():
-    Data([Annotations()])
+    assert Data([Annotations()]) == [[]]
 
 
 def test_validate():

plotly/tests/test_core/test_graph_objs/test_error_bars.py

@@ -41,6 +41,5 @@ def test_instantiate_error_y():
            width=5)
 
 
-@raises(PlotlyDictKeyError)
 def test_key_error():
-    ErrorX(value=0.1, typ='percent', color='red')
+    assert ErrorX(value=0.1, typ='percent', color='red') == {'color': 'red', 'typ': 'percent', 'value': 0.1}

plotly/tests/test_core/test_graph_objs/test_figure.py

@@ -16,7 +16,7 @@ def test_instantiation(self):
             'frames': []
         }
 
-        Figure(native_figure)
+        Figure(**native_figure)
         Figure()
 
     def test_access_top_level(self):

plotly/tests/test_core/test_graph_objs/test_frames.py

@@ -3,7 +3,9 @@
 from unittest import TestCase
 
 from plotly import exceptions
-from plotly.graph_objs import Bar, Frames
+from plotly.graph_objs import Bar, Frames, Frame
+
+import re
 
 
 class FramesTest(TestCase):
@@ -56,20 +58,37 @@ def test_deeply_nested_layout_attributes(self):
         )
 
     def test_deeply_nested_data_attributes(self):
-        frames = Frames()
-        frames.append({})
-        frames[0].data = [Bar()]
-        frames[0].data[0].marker.color = 'red'
+        #frames = Frames()
+        #frames.append({})
+        #frames[0].data = [Bar()]
+        #frames[0].data[0].marker.color = 'red'
+
+        frames = Frame
+        frames.data = [Bar()]
+        frames.data[0].marker.color = 'red'
+
+        # parse out valid attrs from ._prop_descriptions
+        prop_descrip = frames.data[0].marker.line._prop_descriptions
+        prop_descrip
+
+        raw_matches = re.findall(
+            "\n        [a-z]+|        [a-z]+\n", prop_descrip
+        )
+        matches = []
+        for r in raw_matches:
+            r = r.replace(' ', '')
+            r = r.replace('\n', '')
+            matches.append(r)
 
         # It's OK if this needs to change, but we should check *something*.
         self.assertEqual(
-            frames[0].data[0].marker.line._get_valid_attributes(),
+            set(matches),
             {'colorsrc', 'autocolorscale', 'cmin', 'colorscale', 'color',
              'reversescale', 'width', 'cauto', 'widthsrc', 'cmax'}
         )
 
     def test_frame_only_attrs(self):
-        frames = Frames()
+        frames = Frame
         frames.append({})
 
         # It's OK if this needs to change, but we should check *something*.

plotly/tests/test_core/test_graph_objs/test_graph_objs.py

@@ -3,12 +3,13 @@
 import plotly.graph_objs as go
 import plotly.graph_reference as gr
 
+# added FigureWidget to OLD_CLASS_NAMES (v 2 and lower)
 OLD_CLASS_NAMES = ['AngularAxis', 'Annotation', 'Annotations', 'Area',
                    'Bar', 'Box', 'ColorBar', 'Contour', 'Contours',
                    'Data', 'ErrorX', 'ErrorY', 'ErrorZ', 'Figure',
-                   'Font', 'Frames', 'Heatmap', 'Histogram', 'Histogram2d',
-                   'Histogram2dContour', 'Layout', 'Legend', 'Line',
-                   'Margin', 'Marker', 'RadialAxis', 'Scatter',
+                   'FigureWidget', 'Font', 'Frames', 'Heatmap', 'Histogram',
+                   'Histogram2d', 'Histogram2dContour', 'Layout', 'Legend',
+                   'Line', 'Margin', 'Marker', 'RadialAxis', 'Scatter',
                    'Scatter3d', 'Scene', 'Stream', 'Surface', 'Trace',
                    'XAxis', 'XBins', 'YAxis', 'YBins', 'ZAxis']