merge: branch 'main' into codegen2

plotly · gvwilson · Apr 17, 2025 · Feb 4, 2025 · Feb 11, 2025 · Feb 11, 2025
commit 51911a4e110a9c15e217fa161cbace2be214cae9
diff --git a/codegen/datatypes.py b/codegen/datatypes.py
@@ -353,25 +353,21 @@ def __init__(self"""
     buffer.write("\n\n")
     for subtype_node in subtype_nodes:
         name_prop = subtype_node.name_property
-        buffer.write(
-            f"""
-        self._init_provided('{name_prop}', arg, {name_prop})"""
-        )
         if datatype_class == "Template" and name_prop == "data":
             buffer.write(
-                """
-            # Template.data contains a 'scattermapbox' key, which causes a
-            # go.Scattermapbox trace object to be created during validation.
-            # In order to prevent false deprecation warnings from surfacing,
-            # we suppress deprecation warnings for this line only.
-            with warnings.catch_warnings():
-                warnings.filterwarnings("ignore", category=DeprecationWarning)
-                self["data"] = _v"""
+                f"""
+        # Template.data contains a 'scattermapbox' key, which causes a
+        # go.Scattermapbox trace object to be created during validation.
+        # In order to prevent false deprecation warnings from surfacing,
+        # we suppress deprecation warnings for this line only.
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
+            self._init_provided('{name_prop}', arg, {name_prop})"""
             )
         else:
             buffer.write(
                 f"""
-                self['{name_prop}'] = _v"""
+        self._init_provided('{name_prop}', arg, {name_prop})"""
             )
 
     ### Literals

diff --git a/plotly/graph_objs/_figure.py b/plotly/graph_objs/_figure.py
@@ -2,6 +2,7 @@
 
 
 class Figure(BaseFigure):
+
     def __init__(
         self, data=None, layout=None, frames=None, skip_invalid=False, **kwargs
     ):

diff --git a/plotly/graph_objs/_figurewidget.py b/plotly/graph_objs/_figurewidget.py
@@ -2,6 +2,7 @@
 
 
 class FigureWidget(BaseFigureWidget):
+
     def __init__(
         self, data=None, layout=None, frames=None, skip_invalid=False, **kwargs
     ):

diff --git a/plotly/graph_objs/layout/_template.py b/plotly/graph_objs/layout/_template.py
@@ -121,7 +121,13 @@ def __init__(self, arg=None, data=None, layout=None, **kwargs):
         self._skip_invalid = kwargs.pop("skip_invalid", False)
         self._validate = kwargs.pop("_validate", True)
 
-        self._init_provided("data", arg, data)
+        # Template.data contains a 'scattermapbox' key, which causes a
+        # go.Scattermapbox trace object to be created during validation.
+        # In order to prevent false deprecation warnings from surfacing,
+        # we suppress deprecation warnings for this line only.
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
+            self._init_provided("data", arg, data)
         self._init_provided("layout", arg, layout)
         self._process_kwargs(**dict(arg, **kwargs))
         self._skip_invalid = False
diff --git a/plotly/validators/_data.py b/plotly/validators/_data.py
@@ -2,6 +2,7 @@
 
 
 class DataValidator(_plotly_utils.basevalidators.BaseDataValidator):
+
     def __init__(self, plotly_name="data", parent_name="", **kwargs):
 
         super().__init__(
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     class Figure(BaseFigure):
         def __init__(
             self, data=None, layout=None, frames=None, skip_invalid=False, **kwargs
         ):
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,7 @@


		class DataValidator(_plotly_utils.basevalidators.BaseDataValidator):

		def __init__(self, plotly_name="data", parent_name="", **kwargs):

		super().__init__(
Expand Down