update tests to remove mapbox references (change to map where relevant)

Author: emilykl

tests/percy/compare-pandas.py

@@ -16,14 +16,11 @@ def get_fig(html):
 
 for filename in os.listdir("pandas2"):
     if filename not in [
-        "density_mapbox.html",
         "density_map.html",
         "scatter_hover.html",
-        "scatter_mapbox.html",
         "scatter_map.html",
         "line.html",
         "choropleth.html",
-        "line_mapbox.html",
         "line_map.html",
         "scatter_log.html",
     ]:

tests/test_core/test_graph_objs/test_frames.py

@@ -82,15 +82,13 @@ def test_deeply_nested_data_attributes(self):
         self.assertEqual(
             set(matches),
             {
-                "colorsrc",
                 "autocolorscale",
                 "cmin",
                 "colorscale",
                 "color",
                 "reversescale",
                 "width",
                 "cauto",
-                "widthsrc",
                 "cmax",
                 "coloraxis",
             },

tests/test_core/test_graph_objs/test_graph_objs.py

@@ -1,7 +1,6 @@
 from unittest import TestCase
 import warnings
 
-import pytest
 import plotly.graph_objs as go
 
 
@@ -158,17 +157,6 @@ def test_pop_invalid_prop_with_default(self):
 
 
 class TestDeprecationWarnings(TestCase):
-    def test_warn_on_deprecated_mapbox_traces(self):
-        # This test will fail if any of the following traces
-        # fails to emit a DeprecationWarning
-        for trace_constructor in [
-            go.Scattermapbox,
-            go.Densitymapbox,
-            go.Choroplethmapbox,
-        ]:
-            with pytest.warns(DeprecationWarning):
-                _ = go.Figure([trace_constructor()])
-
     def test_no_warn_on_non_deprecated_traces(self):
         # This test will fail if any of the following traces emits a DeprecationWarning
         for trace_constructor in [

tests/test_core/test_graph_objs/test_layout_subplots.py

@@ -21,7 +21,7 @@ def test_initial_access_subplots(self):
         self.assertEqual(self.layout.yaxis, go.layout.YAxis())
         self.assertEqual(self.layout["geo"], go.layout.Geo())
         self.assertEqual(self.layout.scene, go.layout.Scene())
-        self.assertEqual(self.layout.mapbox, go.layout.Mapbox())
+        self.assertEqual(self.layout.map, go.layout.Map())
         self.assertEqual(self.layout.polar, go.layout.Polar())
 
         # Subplot ids of 1 should be mapped to the same object as the base
@@ -30,7 +30,7 @@ def test_initial_access_subplots(self):
         self.assertIs(self.layout.yaxis, self.layout.yaxis1)
         self.assertIs(self.layout.geo, self.layout.geo1)
         self.assertIs(self.layout.scene, self.layout.scene1)
-        self.assertIs(self.layout.mapbox, self.layout.mapbox1)
+        self.assertIs(self.layout.map, self.layout.map1)
         self.assertIs(self.layout.polar, self.layout.polar1)
 
     def test_initial_access_subplot2_1(self):
@@ -145,8 +145,8 @@ def test_subplot_objs_have_proper_type(self):
         self.layout.scene6 = {}
         self.assertIsInstance(self.layout.scene6, go.layout.Scene)
 
-        self.layout.mapbox7 = {}
-        self.assertIsInstance(self.layout.mapbox7, go.layout.Mapbox)
+        self.layout.map7 = {}
+        self.assertIsInstance(self.layout.map7, go.layout.Map)
 
         self.layout.polar8 = {}
         self.assertIsInstance(self.layout.polar8, go.layout.Polar)
@@ -162,7 +162,7 @@ def test_subplot_props_in_constructor(self):
             geo4=go.layout.Geo(bgcolor="blue"),
             ternary5=go.layout.Ternary(sum=120),
             scene6=go.layout.Scene(dragmode="zoom"),
-            mapbox7=go.layout.Mapbox(zoom=2),
+            map7=go.layout.Map(zoom=2),
             polar8=go.layout.Polar(sector=[0, 90]),
         )
 
@@ -171,7 +171,7 @@ def test_subplot_props_in_constructor(self):
         self.assertEqual(layout.geo4.bgcolor, "blue")
         self.assertEqual(layout.ternary5.sum, 120)
         self.assertEqual(layout.scene6.dragmode, "zoom")
-        self.assertEqual(layout.mapbox7.zoom, 2)
+        self.assertEqual(layout.map7.zoom, 2)
         self.assertEqual(layout.polar8.sector, (0, 90))
 
     def test_create_subplot_with_update(self):
@@ -182,7 +182,7 @@ def test_create_subplot_with_update(self):
             geo4=go.layout.Geo(bgcolor="blue"),
             ternary5=go.layout.Ternary(sum=120),
             scene6=go.layout.Scene(dragmode="zoom"),
-            mapbox7=go.layout.Mapbox(zoom=2),
+            map7=go.layout.Map(zoom=2),
             polar8=go.layout.Polar(sector=[0, 90]),
         )
 
@@ -192,7 +192,7 @@ def test_create_subplot_with_update(self):
         self.assertEqual(self.layout.geo4.bgcolor, "blue")
         self.assertEqual(self.layout.ternary5.sum, 120)
         self.assertEqual(self.layout.scene6.dragmode, "zoom")
-        self.assertEqual(self.layout.mapbox7.zoom, 2)
+        self.assertEqual(self.layout.map7.zoom, 2)
         self.assertEqual(self.layout.polar8.sector, (0, 90))
 
     def test_create_subplot_with_update_dict(self):
@@ -204,7 +204,7 @@ def test_create_subplot_with_update_dict(self):
                 "geo4": {"bgcolor": "blue"},
                 "ternary5": {"sum": 120},
                 "scene6": {"dragmode": "zoom"},
-                "mapbox7": {"zoom": 2},
+                "map7": {"zoom": 2},
                 "polar8": {"sector": [0, 90]},
             }
         )
@@ -215,7 +215,7 @@ def test_create_subplot_with_update_dict(self):
         self.assertEqual(self.layout.geo4.bgcolor, "blue")
         self.assertEqual(self.layout.ternary5.sum, 120)
         self.assertEqual(self.layout.scene6.dragmode, "zoom")
-        self.assertEqual(self.layout.mapbox7.zoom, 2)
+        self.assertEqual(self.layout.map7.zoom, 2)
         self.assertEqual(self.layout.polar8.sector, (0, 90))
 
     def test_bug_1462(self):

tests/test_core/test_update_objects/test_update_subplots.py

@@ -109,11 +109,11 @@ def test_select_by_type(self):
 
         self.assert_select_subplots("ternary", "ternaries", [1], test_no_grid=True)
 
-        # No 'geo' or 'mapbox' subplots initialized, but the first subplot
+        # No 'geo' or 'map' subplots initialized, but the first subplot
         # object is always present
         self.assert_select_subplots("geo", "geos", [1], test_no_grid=True)
 
-        self.assert_select_subplots("mapbox", "mapboxes", [1], test_no_grid=True)
+        self.assert_select_subplots("map", "maps", [1], test_no_grid=True)
 
     def test_select_by_type_and_grid(self):
         self.assert_select_subplots("xaxis", "xaxes", [1, 2], row=1)
@@ -261,7 +261,7 @@ def test_select_by_type_and_selector(self):
             "ternary", "ternaries", [1], selector=-1, test_no_grid=True
         )
 
-        # No 'geo' or 'mapbox' subplots initialized, but the first subplot
+        # No 'geo' or 'map' subplots initialized, but the first subplot
         # object is always present
         self.assert_select_subplots(
             "geo", "geos", [], selector={"bgcolor": "blue"}, test_no_grid=True
@@ -272,7 +272,7 @@ def test_select_by_type_and_selector(self):
         )
 
         self.assert_select_subplots(
-            "mapbox", "mapboxes", [], selector={"pitch": 45}, test_no_grid=True
+            "map", "maps", [], selector={"pitch": 45}, test_no_grid=True
         )
 
     def test_select_by_type_and_grid_and_selector(self):
@@ -421,14 +421,14 @@ def test_update_by_type(self):
             test_no_grid=True,
         )
 
-        # No 'geo' or 'mapbox' subplots initialized, but the first subplot
+        # No 'geo' or 'map' subplots initialized, but the first subplot
         # object is always present
         self.assert_update_subplots(
             "geo", "geos", [1], {"bgcolor": "purple"}, test_no_grid=True
         )
 
         self.assert_update_subplots(
-            "mapbox", "mapboxes", [1], {"pitch": 99}, test_no_grid=True
+            "map", "maps", [1], {"pitch": 99}, test_no_grid=True
         )
 
     def test_update_by_type_and_grid(self):

tests/test_optional/test_figure_factory/test_figure_factory.py

@@ -1121,7 +1121,7 @@ def test_optional_arguments(self):
             assert len(fig.data) == ncontours + 2 + arg_set["showscale"]
 
 
-class TestHexbinMapbox(NumpyTestUtilsMixin, TestCaseNoTemplate):
+class TestHexbinMap(NumpyTestUtilsMixin, TestCaseNoTemplate):
     def compare_list_values(self, list1, list2, decimal=7):
         assert len(list1) == len(list2), "Lists are not of the same length."
         for i in range(len(list1)):

tests/test_optional/test_graph_objs/test_skipped_b64_keys.py

@@ -41,7 +41,7 @@ def test_np_geojson(self):
 
     def test_np_layers(self):
         layout = {
-            "mapbox": {
+            "map": {
                 "layers": [
                     {
                         "sourcetype": "geojson",
@@ -70,9 +70,9 @@ def test_np_layers(self):
 
         fig = go.Figure(data=data, layout=layout)
 
-        assert (fig.layout["mapbox"]["layers"][0]["line"]["dash"] == (2.5, 1)).all()
+        assert (fig.layout["map"]["layers"][0]["line"]["dash"] == (2.5, 1)).all()
 
-        assert json.loads(fig.to_json())["layout"]["mapbox"]["layers"][0]["source"][
+        assert json.loads(fig.to_json())["layout"]["map"]["layers"][0]["source"][
             "features"
         ][0]["geometry"]["coordinates"] == [[0.25, 52], [0.75, 50]]
 

tests/test_optional/test_px/test_px.py

@@ -447,24 +447,6 @@ def test_load_px_data(return_type):
         assert len(df) > 0
 
 
-def test_warn_on_deprecated_mapbox_px_constructors():
-    # This test will fail if any of the following px constructors
-    # fails to emit a DeprecationWarning
-    for fig_constructor in [
-        px.line_mapbox,
-        px.scatter_mapbox,
-        px.density_mapbox,
-        px.choropleth_mapbox,
-    ]:
-        # Look for warnings with the string "_mapbox" in them
-        # to make sure the warning is coming from px rather than go
-        with pytest.warns(DeprecationWarning, match="_mapbox"):
-            if fig_constructor == px.choropleth_mapbox:
-                fig_constructor(locations=["CA", "TX", "NY"])
-            else:
-                fig_constructor(lat=[10, 20, 30], lon=[10, 20, 30])
-
-
 def test_no_warn_on_non_deprecated_px_constructors():
     # This test will fail if any of the following px constructors
     # emits a DeprecationWarning

tests/test_plotly_utils/validators/test_fig_deepcopy.py

@@ -12,9 +12,6 @@
 
 
 @pytest.mark.parametrize("return_type", ["pandas", "polars", "pyarrow"])
-@pytest.mark.filterwarnings(
-    r"ignore:\*scattermapbox\* is deprecated! Use \*scattermap\* instead"
-)
 def test_deepcopy_dataframe(return_type):
     gapminder = px.data.gapminder(return_type=return_type)
     fig = px.line(gapminder, x="year", y="gdpPercap", color="country")
@@ -23,9 +20,6 @@ def test_deepcopy_dataframe(return_type):
     assert fig_copied.to_dict() == fig.to_dict()
 
 
-@pytest.mark.filterwarnings(
-    r"ignore:\*scattermapbox\* is deprecated! Use \*scattermap\* instead"
-)
 def test_deepcopy_array():
     gapminder = px.data.gapminder()
     x = gapminder["year"].to_numpy()