remove mapbox references from codegen and rerun codegen

Author: emilykl

codegen/datatypes.py

@@ -5,11 +5,6 @@
 from codegen.utils import CAVEAT, write_source_py
 
 
-deprecated_mapbox_traces = [
-    "scattermapbox",
-    "choroplethmapbox",
-    "densitymapbox",
-]
 locationmode_traces = [
     "choropleth",
     "scattergeo",
@@ -102,11 +97,7 @@ def build_datatype_py(node):
     )
     buffer.write("import copy as _copy\n")
 
-    if (
-        node.name_property in deprecated_mapbox_traces
-        or node.name_property in locationmode_traces
-        or node.name_property == "template"
-    ):
+    if node.name_property in locationmode_traces or node.name_property == "template":
         buffer.write("import warnings\n")
 
     # Write class definition
@@ -375,22 +366,10 @@ def __init__(self"""
     buffer.write("\n\n")
     for subtype_node in subtype_nodes:
         name_prop = subtype_node.name_property
-        if datatype_class == "Template" and name_prop == "data":
-            buffer.write(
-                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._set_property("{name_prop}", arg, {name_prop})"""
-            )
-        else:
-            buffer.write(
-                f"""
+        buffer.write(
+            f"""
         self._set_property("{name_prop}", arg, {name_prop})"""
-            )
+        )
 
     # Literals
     if literal_nodes:
@@ -411,19 +390,6 @@ def __init__(self"""
 """
     )
 
-    if node.name_property in deprecated_mapbox_traces:
-        buffer.write(
-            f"""
-        warnings.warn(
-            "*{node.name_property}* is deprecated!"
-            + " Use *{node.name_property.replace("mapbox", "map")}* instead."
-            + " Learn more at: https://plotly.com/python/mapbox-to-maplibre/",
-            stacklevel=2,
-            category=DeprecationWarning,
-        )
-"""
-        )
-
     # Return source string
     return buffer.getvalue()
 

plotly/graph_objs/layout/_template.py

@@ -121,13 +121,7 @@ def __init__(self, arg=None, data=None, layout=None, **kwargs):
         self._skip_invalid = kwargs.pop("skip_invalid", False)
         self._validate = kwargs.pop("_validate", True)
 
-        # 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._set_property("data", arg, data)
+        self._set_property("data", arg, data)
         self._set_property("layout", arg, layout)
         self._process_kwargs(**dict(arg, **kwargs))
         self._skip_invalid = False

templategen/definitions.py

@@ -139,8 +139,8 @@ def simple_white():
     opts = {"marker": {"line": {"width": 0.6, "color": "white"}}}
     template.data.histogram = [opts]
 
-    # Mapbox light style
-    template.layout.mapbox.style = "light"
+    # Light map style
+    template.layout.map.style = "light"
 
     # Automargin for pie chart
     template.data.pie = [{"automargin": True}]
@@ -407,8 +407,8 @@ def plotly():
     template.layout.xaxis.zerolinewidth = 2
     template.layout.yaxis.zerolinewidth = 2
 
-    # Mapbox light style
-    template.layout.mapbox.style = "light"
+    # Light map style
+    template.layout.map.style = "light"
 
     # Automargin for pie chart
     template.data.pie = [{"automargin": True}]
@@ -487,8 +487,8 @@ def plotly_white():
     template.layout.xaxis.zerolinewidth = 2
     template.layout.yaxis.zerolinewidth = 2
 
-    # Mapbox light style
-    template.layout.mapbox.style = "light"
+    # Light map style
+    template.layout.map.style = "light"
 
     # Automargin for pie chart
     template.data.pie = [{"automargin": True}]
@@ -575,8 +575,8 @@ def plotly_dark():
     template.layout.xaxis.zerolinewidth = 2
     template.layout.yaxis.zerolinewidth = 2
 
-    # Mapbox light style
-    template.layout.mapbox.style = "dark"
+    # Light map style
+    template.layout.map.style = "dark"
 
     # Set marker outline color
     opts = {"marker": {"line": {"color": plotly_clrs["Rhino Darker"]}}}

templategen/utils/__init__.py

@@ -20,7 +20,6 @@
     ("scatter3d", "line"),
     ("scatter3d", "marker"),
     ("scattermap", "marker"),
-    ("scattermapbox", "marker"),
     ("scatterternary", "marker"),
     ("scattercarpet", "marker"),
     ("scatter", "marker", "line"),