ruff fixes in visualization (#2867)

Author: quaquel

mesa/visualization/mpl_space_drawing.py

@@ -205,7 +205,7 @@ def draw_space(
 
     """
     if ax is None:
-        fig, ax = plt.subplots()
+        _, ax = plt.subplots()
 
     # https://stackoverflow.com/questions/67524641/convert-multiple-isinstance-checks-to-structural-pattern-matching
     match space:
@@ -443,7 +443,7 @@ def draw_orthogonal_grid(
 
     """
     if ax is None:
-        fig, ax = plt.subplots()
+        _, ax = plt.subplots()
 
     # gather agent data
     s_default = (180 / max(space.width, space.height)) ** 2
@@ -488,7 +488,7 @@ def draw_hex_grid(
     "size", "marker", "zorder", alpha, linewidths, and edgecolors. Other field are ignored and will result in a user warning.
     """
     if ax is None:
-        fig, ax = plt.subplots()
+        _, ax = plt.subplots()
 
     # gather data
     s_default = (180 / max(space.width, space.height)) ** 2
@@ -573,7 +573,7 @@ def draw_network(
 
     """
     if ax is None:
-        fig, ax = plt.subplots()
+        _, ax = plt.subplots()
     if layout_kwargs is None:
         layout_kwargs = {"seed": 0}
 
@@ -642,7 +642,7 @@ def draw_continuous_space(
 
     """
     if ax is None:
-        fig, ax = plt.subplots()
+        _, ax = plt.subplots()
 
     # space related setup
     width = space.x_max - space.x_min
@@ -694,7 +694,7 @@ def draw_voronoi_grid(
 
     """
     if ax is None:
-        fig, ax = plt.subplots()
+        _, ax = plt.subplots()
 
     x_list = [i[0] for i in space.centroids_coordinates]
     y_list = [i[1] for i in space.centroids_coordinates]

mesa/visualization/space_drawers.py

@@ -101,7 +101,7 @@ def draw_matplotlib(self, ax=None, **space_kwargs):
         }
 
         if ax is None:
-            fig, ax = plt.subplots(**fig_kwargs)
+            _, ax = plt.subplots(**fig_kwargs)
 
         # gridline styling kwargs
         line_kwargs = {
@@ -282,7 +282,7 @@ def draw_matplotlib(self, ax=None, **space_kwargs):
         }
 
         if ax is None:
-            fig, ax = plt.subplots(**fig_kwargs)
+            _, ax = plt.subplots(**fig_kwargs)
 
         line_kwargs = {
             "color": "black",
@@ -414,7 +414,7 @@ def draw_matplotlib(self, ax=None, **space_kwargs):
             The modified axes object.
         """
         if ax is None:
-            fig, ax = plt.subplots()
+            _, ax = plt.subplots()
 
         ax.set_axis_off()
         ax.set_xlim(self.viz_xmin, self.viz_xmax)
@@ -554,7 +554,7 @@ def draw_matplotlib(self, ax=None, **space_kwargs):
             The modified axes object
         """
         if ax is None:
-            fig, ax = plt.subplots()
+            _, ax = plt.subplots()
 
         border_style = "solid" if not self.space.torus else (0, (5, 10))
         spine_kwargs = {"linewidth": 1.5, "color": "black", "linestyle": border_style}
@@ -726,7 +726,7 @@ def draw_matplotlib(self, ax=None, **space_kwargs):
             The modified axes object
         """
         if ax is None:
-            fig, ax = plt.subplots()
+            _, ax = plt.subplots()
 
         final_segments, clip_box = self._get_clipped_segments()
 

tests/test_components_matplotlib.py

@@ -69,7 +69,7 @@ def my_portrayal(agent):
         agent = Agent(model)
         grid.move_to_empty(agent)
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_space(grid, my_portrayal, ax=ax)
 
     # draw space for voroinoi
@@ -80,7 +80,7 @@ def my_portrayal(agent):
         agent = CellAgent(model)
         agent.cell = grid.select_random_empty_cell()
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_space(grid, my_portrayal, ax=ax)
 
     # draw orthogonal grid
@@ -89,7 +89,7 @@ def my_portrayal(agent):
     for _ in range(10):
         agent = CellAgent(model)
         agent.cell = grid.select_random_empty_cell()
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_space(grid, my_portrayal, ax=ax)
 
     # draw network
@@ -104,7 +104,7 @@ def my_portrayal(agent):
         agent = Agent(model)
         pos = agent.random.randint(0, len(graph.nodes) - 1)
         grid.place_agent(agent, pos)
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_space(grid, my_portrayal, ax=ax)
 
     # draw continuous space
@@ -116,7 +116,7 @@ def my_portrayal(agent):
         agent = Agent(model)
         space.place_agent(agent, (x, y))
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_space(space, my_portrayal, ax=ax)
 
 
@@ -128,7 +128,7 @@ def test_draw_hex_grid():
         agent = Agent(model)
         grid.move_to_empty(agent)
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_hex_grid(grid, agent_portrayal, ax)
 
     model = Model(seed=42)
@@ -137,7 +137,7 @@ def test_draw_hex_grid():
         agent = CellAgent(model)
         agent.cell = grid.select_random_empty_cell()
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_hex_grid(grid, agent_portrayal, ax)
 
 
@@ -152,7 +152,7 @@ def test_draw_voronoi_grid():
         agent = CellAgent(model)
         agent.cell = grid.select_random_empty_cell()
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_voronoi_grid(grid, agent_portrayal, ax)
 
 
@@ -164,7 +164,7 @@ def test_draw_orthogonal_grid():
         agent = Agent(model)
         grid.move_to_empty(agent)
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_orthogonal_grid(grid, agent_portrayal, ax)
 
     model = Model(seed=42)
@@ -173,7 +173,7 @@ def test_draw_orthogonal_grid():
         agent = CellAgent(model)
         agent.cell = grid.select_random_empty_cell()
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_orthogonal_grid(grid, agent_portrayal, ax)
 
 
@@ -187,7 +187,7 @@ def test_draw_continuous_space():
         agent = Agent(model)
         space.place_agent(agent, (x, y))
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_continuous_space(space, agent_portrayal, ax)
 
 
@@ -205,7 +205,7 @@ def test_draw_network():
         pos = agent.random.randint(0, len(graph.nodes) - 1)
         grid.place_agent(agent, pos)
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_network(grid, agent_portrayal, ax)
 
     model = Model(seed=42)
@@ -214,7 +214,7 @@ def test_draw_network():
         agent = CellAgent(model)
         agent.cell = grid.select_random_empty_cell()
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_network(grid, agent_portrayal, ax)
 
 
@@ -224,12 +224,12 @@ def test_draw_property_layers():
     grid = SingleGrid(10, 10, torus=True)
     grid.add_property_layer(PropertyLayer("test", grid.width, grid.height, 0))
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_property_layers(grid, {"test": {"colormap": "viridis", "colorbar": True}}, ax)
 
     model = Model(seed=42)
     grid = OrthogonalMooreGrid((10, 10), torus=True, random=model.random, capacity=1)
     grid.create_property_layer("test", 0.0)
 
-    fig, ax = plt.subplots()
+    _, ax = plt.subplots()
     draw_property_layers(grid, {"test": {"colormap": "viridis", "colorbar": True}}, ax)

tests/test_discrete_space.py

@@ -3,6 +3,7 @@
 import copy
 import pickle
 import random
+import re
 
 import networkx as nx
 import numpy as np
@@ -909,7 +910,9 @@ def test_property_layer_errors():
 
     # Test adding a PropertyLayer with an existing name
     grid.add_property_layer(elevation)
-    with pytest.raises(ValueError, match="Property layer elevation already exists."):
+    with pytest.raises(
+        ValueError, match=re.escape("Property layer elevation already exists.")
+    ):
         grid.add_property_layer(elevation)
 
     # test adding a layer with different dimensions than space
@@ -918,7 +921,9 @@ def test_property_layer_errors():
     elevation = PropertyLayer("elevation", (10, 10), default_value=0.0)
     with pytest.raises(
         ValueError,
-        match="Dimensions of property layer do not match the dimensions of the grid",
+        match=re.escape(
+            "Dimensions of property layer do not match the dimensions of the grid"
+        ),
     ):
         grid.add_property_layer(elevation)
 

tests/test_portrayal_components.py

@@ -1,5 +1,6 @@
 """Tests for the portrayal components in Mesa visualization."""
 
+import re
 from dataclasses import is_dataclass
 
 import pytest
@@ -63,7 +64,8 @@ def test_agent_portrayal_style_update_non_existent_attribute():
     """Test updating a non-existent attribute raises AttributeError."""
     style = AgentPortrayalStyle()
     with pytest.raises(
-        AttributeError, match="'AgentPortrayalStyle' object has no attribute 'shape'"
+        AttributeError,
+        match=re.escape("'AgentPortrayalStyle' object has no attribute 'shape'"),
     ):
         style.update(("shape", "triangle"))
 
@@ -128,12 +130,14 @@ def test_property_layer_style_custom_initialization_with_color():
 def test_property_layer_style_post_init_both_color_and_colormap_error():
     """Test error when both color and colormap are specified."""
     with pytest.raises(
-        ValueError, match="Specify either 'color' or 'colormap', not both."
+        ValueError, match=re.escape("Specify either 'color' or 'colormap', not both.")
     ):
         PropertyLayerStyle(colormap="viridis", color="red")
 
 
 def test_property_layer_style_post_init_neither_color_nor_colormap_error():
     """Test error when neither color nor colormap is specified."""
-    with pytest.raises(ValueError, match="Specify one of 'color' or 'colormap'"):
+    with pytest.raises(
+        ValueError, match=re.escape("Specify one of 'color' or 'colormap'")
+    ):
         PropertyLayerStyle()

tests/test_solara_viz.py

@@ -1,5 +1,6 @@
 """Test Solara visualizations."""
 
+import re
 import unittest
 
 import ipyvuetify as vw
@@ -254,23 +255,27 @@ def __init__(self, **kwargs):
     _check_model_params(ModelWithKwargs.__init__, {})
 
     # Test invalid parameter name raises ValueError
-    with pytest.raises(ValueError, match="Invalid model parameter: invalid_param"):
+    with pytest.raises(
+        ValueError, match=re.escape("Invalid model parameter: invalid_param")
+    ):
         _check_model_params(
             ModelWithOptionalParams.__init__, {"required_param": 1, "invalid_param": 2}
         )
 
     # Test missing required parameter raises ValueError
-    with pytest.raises(ValueError, match="Missing required model parameter: param2"):
+    with pytest.raises(
+        ValueError, match=re.escape("Missing required model parameter: param2")
+    ):
         _check_model_params(ModelWithOnlyRequired.__init__, {"param1": 1})
 
     # Test passing extra parameters raises ValueError
-    with pytest.raises(ValueError, match="Invalid model parameter: extra"):
+    with pytest.raises(ValueError, match=re.escape("Invalid model parameter: extra")):
         _check_model_params(
             ModelWithOnlyRequired.__init__, {"param1": 1, "param2": 2, "extra": 3}
         )
 
     # Test empty params dict raises ValueError if required params
-    with pytest.raises(ValueError, match="Missing required model parameter"):
+    with pytest.raises(ValueError, match=re.escape("Missing required model parameter")):
         _check_model_params(ModelWithOnlyRequired.__init__, {})
 
 
@@ -295,7 +300,7 @@ def __init__(self, param1):
         handle_error=False,
     )
 
-    with pytest.raises(ValueError, match="Missing required model parameter"):
+    with pytest.raises(ValueError, match=re.escape("Missing required model parameter")):
         solara.render(
             ModelCreator(
                 solara.reactive(ModelWithRequiredParam(param1="mock")), user_params={}
@@ -316,6 +321,8 @@ def __init__(self, param1, *args):
 
     with pytest.raises(
         ValueError,
-        match="Mesa's visualization requires the use of keyword arguments to ensure the parameters are passed to Solara correctly. Please ensure all model parameters are of form param=value",
+        match=re.escape(
+            "Mesa's visualization requires the use of keyword arguments to ensure the parameters are passed to Solara correctly. Please ensure all model parameters are of form param=value"
+        ),
     ):
         _check_model_params(ModelWithArgsOnly.__init__, model_params)