From 8f62e0c120803f890b3ceafba4e20e36a93d7c7e Mon Sep 17 00:00:00 2001
From: Suryansh Garg <133861447+suryanshgargbpgc@users.noreply.github.com>
Date: Mon, 24 Mar 2025 01:22:55 +0530
Subject: [PATCH 01/11] Fix Sugarscape example compatibility with Mesa 3.0

t updates the Sugarscape example to work with Mesa 3.0 by addressing
several compatibility issues:

- Fixed model initialization to properly pass seed to Mesa base class
- Updated agent creation and tracking to use Mesa 3.0's automatic ID assignment
- Replaced deprecated scheduler methods with direct agent iteration for stability
- Modified Sugar agent step method to correctly handle cell occupation checks
- Removed manual agent list management that conflicted with Mesa's built-in tracking
---
 examples/sugarscape_ig/ss_mesa/agents.py  |  23 +--
 examples/sugarscape_ig/ss_mesa/model.py   |  51 ++++---
 examples/sugarscape_ig/sugarscape_test.py | 165 ++++++++++++++++++++++
 examples/sugarscape_ig/test_results.txt   |   5 +
 pyproject.toml                            |   2 +-
 5 files changed, 219 insertions(+), 27 deletions(-)
 create mode 100644 examples/sugarscape_ig/sugarscape_test.py
 create mode 100644 examples/sugarscape_ig/test_results.txt

diff --git a/examples/sugarscape_ig/ss_mesa/agents.py b/examples/sugarscape_ig/ss_mesa/agents.py
index 7577203e..77a12f7f 100644
--- a/examples/sugarscape_ig/ss_mesa/agents.py
+++ b/examples/sugarscape_ig/ss_mesa/agents.py
@@ -17,8 +17,9 @@ def get_distance(pos_1, pos_2):
 
 
 class AntMesa(mesa.Agent):
-    def __init__(self, unique_id, model, moore=False, sugar=0, metabolism=0, vision=0):
-        super().__init__(unique_id, model)
+    def __init__(self, model, moore=False, sugar=0, metabolism=0, vision=0):
+        # unique_id is automatically assigned in Mesa 3.0
+        super().__init__(model)
         self.moore = moore
         self.sugar = sugar
         self.metabolism = metabolism
@@ -67,17 +68,23 @@ def step(self):
         self.eat()
         if self.sugar <= 0:
             self.model.space.remove_agent(self)
-            self.model.agents.remove(self)
+            # Agent is automatically removed from model.agents in Mesa 3.0
 
 
 class Sugar(mesa.Agent):
-    def __init__(self, unique_id, model, max_sugar):
-        super().__init__(unique_id, model)
+    def __init__(self, model, max_sugar):
+        # unique_id is automatically assigned in Mesa 3.0
+        super().__init__(model)
         self.amount = max_sugar
         self.max_sugar = max_sugar
 
     def step(self):
-        if self.model.space.is_cell_empty(self.pos):
+        """
+        Simple regrow rule for sugar: if no ant is present, grow back to max.
+        """
+        # Simple check for ant presence
+        pos_agents = self.model.space.get_cell_list_contents([self.pos])
+        has_ant = any(isinstance(agent, AntMesa) for agent in pos_agents)
+
+        if not has_ant:
             self.amount = self.max_sugar
-        else:
-            self.amount = 0
diff --git a/examples/sugarscape_ig/ss_mesa/model.py b/examples/sugarscape_ig/ss_mesa/model.py
index 076af8ee..2a7f5706 100644
--- a/examples/sugarscape_ig/ss_mesa/model.py
+++ b/examples/sugarscape_ig/ss_mesa/model.py
@@ -26,7 +26,8 @@ def __init__(
         Create a new Instant Growback model with the given parameters.
 
         """
-        super().__init__()
+        # Initialize the Mesa base class (required in Mesa 3.0)
+        super().__init__(seed=seed)
 
         # Set parameters
         if sugar_grid is None:
@@ -37,48 +38,62 @@ def __init__(
             metabolism = np.random.randint(2, 4, n_agents)
         if vision is None:
             vision = np.random.randint(1, 6, n_agents)
-        if seed is not None:
-            self.reset_randomizer(seed)
 
         self.width, self.height = sugar_grid.shape
         self.n_agents = n_agents
         self.space = mesa.space.MultiGrid(self.width, self.height, torus=False)
-        self.agents: list = []
-
-        agent_id = 0
         self.sugars = []
 
+        # Create sugar resources
+        sugar_count = 0
         for _, (x, y) in self.space.coord_iter():
             max_sugar = sugar_grid[x, y]
-            sugar = Sugar(agent_id, self, max_sugar)
-            agent_id += 1
+            sugar = Sugar(self, max_sugar)
             self.space.place_agent(sugar, (x, y))
             self.sugars.append(sugar)
+            sugar_count += 1
 
-        # Create agent:
+        # Create AntMesa agents
+        ant_count = 0
         for i in range(self.n_agents):
+            # Determine position
             if initial_positions is not None:
                 x = initial_positions["dim_0"][i]
                 y = initial_positions["dim_1"][i]
             else:
                 x = self.random.randrange(self.width)
                 y = self.random.randrange(self.height)
-            ssa = AntMesa(
-                agent_id, self, False, initial_sugar[i], metabolism[i], vision[i]
+
+            # Create and place agent
+            ant = AntMesa(
+                self,
+                moore=False,
+                sugar=initial_sugar[i],
+                metabolism=metabolism[i],
+                vision=vision[i],
             )
-            agent_id += 1
-            self.space.place_agent(ssa, (x, y))
-            self.agents.append(ssa)
+            self.space.place_agent(ant, (x, y))
+            ant_count += 1
 
         self.running = True
 
     def step(self):
-        self.random.shuffle(self.agents)
-        [agent.step() for agent in self.agents]
-        [sugar.step() for sugar in self.sugars]
+        # Get all AntMesa agents
+        ant_agents = [agent for agent in self.agents if isinstance(agent, AntMesa)]
+
+        # Randomize the order
+        self.random.shuffle(ant_agents)
+
+        # Step each ant agent directly
+        for ant in ant_agents:
+            ant.step()
+
+        # Process Sugar agents directly
+        for sugar in self.sugars:
+            sugar.step()
 
     def run_model(self, step_count=200):
         for i in range(step_count):
-            if len(self.agents) == 0:
+            if self.agents.count(AntMesa) == 0:
                 return
             self.step()
diff --git a/examples/sugarscape_ig/sugarscape_test.py b/examples/sugarscape_ig/sugarscape_test.py
new file mode 100644
index 00000000..b1c1f66e
--- /dev/null
+++ b/examples/sugarscape_ig/sugarscape_test.py
@@ -0,0 +1,165 @@
+import mesa
+import sys
+from ss_mesa.model import SugarscapeMesa
+from ss_mesa.agents import AntMesa, Sugar
+
+
+def test_model_creation():
+    """Test that the model can be created properly with Mesa 3.x"""
+    print("\n--- Testing Model Creation ---")
+    
+    # Print Mesa version
+    print(f"Using Mesa version: {mesa.__version__}")
+    
+    # Create the model
+    print("Creating Sugarscape model...")
+    model = SugarscapeMesa(10, width=10, height=10)
+    
+    # Count agents with isinstance
+    total_agents = len(model.agents)
+    ant_count = sum(1 for agent in model.agents if isinstance(agent, AntMesa))
+    sugar_count = sum(1 for agent in model.agents if isinstance(agent, Sugar))
+    
+    print(f"Total agents: {total_agents}")
+    print(f"AntMesa agents: {ant_count}")
+    print(f"Sugar agents: {sugar_count}")
+    
+    # Check that we have the expected number of agents
+    assert total_agents == (10*10 + 10), "Unexpected total agent count"
+    assert ant_count == 10, "Unexpected AntMesa agent count"
+    assert sugar_count == 10*10, "Unexpected Sugar agent count"
+    
+    # Show some of the agents
+    print("\nSample of agents in model:")
+    for i, agent in enumerate(model.agents):
+        if i < 5:
+            print(f"Agent {i} - Type: {type(agent).__name__}, ID: {agent.unique_id}")
+        else:
+            print("...")
+            break
+    
+    print("Model creation test passed!")
+    return model
+
+
+def test_model_step(model):
+    """Test that the model can be stepped with Mesa 3.x"""
+    print("\n--- Testing Model Step ---")
+    
+    # Count agents before stepping
+    ant_count_before = sum(1 for agent in model.agents if isinstance(agent, AntMesa))
+    print(f"AntMesa agents before step: {ant_count_before}")
+    
+    # Step the model
+    print("Running one step...")
+    try:
+        model.step()
+        print("Step completed successfully!")
+        
+        # Count agents after stepping
+        ant_count_after = sum(1 for agent in model.agents if isinstance(agent, AntMesa))
+        print(f"AntMesa agents after step: {ant_count_after}")
+        
+    except Exception as e:
+        print(f"Error running step: {e}")
+        assert False, f"Model step failed: {e}"
+    
+    print("Model step test passed!")
+
+
+def test_simple_model():
+    """Test a simplified model with just a few agents to isolate behavior"""
+    print("\n--- Testing Simple Model ---")
+    
+    # Create a simpler model
+    class SimpleModel(mesa.Model):
+        def __init__(self, seed=None):
+            super().__init__(seed=seed)
+            self.space = mesa.space.MultiGrid(5, 5, torus=False)
+            
+            # Add sugar agents to all cells
+            self.sugars = []
+            for x in range(5):
+                for y in range(5):
+                    sugar = Sugar(self, 5)
+                    self.space.place_agent(sugar, (x, y))
+                    self.sugars.append(sugar)
+            
+            # Create one ant agent
+            self.ant = AntMesa(self, False, 10, 2, 3)
+            self.space.place_agent(self.ant, (2, 2))  # Place in the middle
+        
+        def step(self):
+            # Step the sugar agents
+            for sugar in self.sugars:
+                sugar.step()
+            
+            # Step the ant agent
+            self.ant.step()
+    
+    # Create and test
+    print("Creating simple model...")
+    simple_model = SimpleModel()
+    print("Created model")
+    
+    # Check agents
+    print(f"Agents in model: {len(simple_model.agents)}")
+    ant_count = sum(1 for agent in simple_model.agents if isinstance(agent, AntMesa))
+    sugar_count = sum(1 for agent in simple_model.agents if isinstance(agent, Sugar))
+    print(f"AntMesa agents: {ant_count}")
+    print(f"Sugar agents: {sugar_count}")
+    
+    # Try to step sugar agents directly
+    print("\nStepping sugar agents directly...")
+    try:
+        for sugar in simple_model.sugars:
+            sugar.step()
+        print("Sugar steps successful!")
+    except Exception as e:
+        print(f"Error stepping sugar: {e}")
+        assert False, f"Sugar step failed: {e}"
+    
+    # Try to step ant agent directly
+    print("\nStepping ant agent directly...")
+    try:
+        simple_model.ant.step()
+        print("Ant step successful!")
+    except Exception as e:
+        print(f"Error stepping ant: {e}")
+        assert False, f"Ant step failed: {e}"
+    
+    # Try to step the model
+    print("\nStepping simple model...")
+    try:
+        simple_model.step()
+        print("Model step successful!")
+    except Exception as e:
+        print(f"Error stepping model: {e}")
+        assert False, f"Simple model step failed: {e}"
+    
+    print("Simple model test passed!")
+
+
+def run_tests():
+    """Run all tests in sequence"""
+    try:
+        # Test 1: Model Creation
+        model = test_model_creation()
+        
+        # Test 2: Model Step
+        test_model_step(model)
+        
+        # Test 3: Simple Model
+        test_simple_model()
+        
+        print("\n--- All Tests Passed Successfully! ---")
+        print(f"The Sugarscape model is working correctly with Mesa {mesa.__version__}")
+        return True
+    except AssertionError as e:
+        print(f"\nTest failed: {e}")
+        return False
+
+
+if __name__ == "__main__":
+    success = run_tests()
+    sys.exit(0 if success else 1) 
\ No newline at end of file
diff --git a/examples/sugarscape_ig/test_results.txt b/examples/sugarscape_ig/test_results.txt
new file mode 100644
index 00000000..30cfcf72
--- /dev/null
+++ b/examples/sugarscape_ig/test_results.txt
@@ -0,0 +1,5 @@
+Mesa version: 3.1.4
+
+Creating Sugarscape model...
+Created model with 50 AntMesa agents
+Successfully ran the Sugarscape model with Mesa 3.x!
diff --git a/pyproject.toml b/pyproject.toml
index c81ebe01..680deb77 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -88,7 +88,7 @@ test = [
 
 dev = [
   "mesa_frames[test, docs]",
-  "mesa~=2.4.0",
+  "mesa~=3.1.0",
   "numba",
 ]
 

From 5efb10cbf72479a14cb69c912823320a2fdaf834 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 23 Mar 2025 19:53:41 +0000
Subject: [PATCH 02/11] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 examples/sugarscape_ig/sugarscape_test.py | 58 +++++++++++------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/examples/sugarscape_ig/sugarscape_test.py b/examples/sugarscape_ig/sugarscape_test.py
index b1c1f66e..9c90c2e4 100644
--- a/examples/sugarscape_ig/sugarscape_test.py
+++ b/examples/sugarscape_ig/sugarscape_test.py
@@ -7,28 +7,28 @@
 def test_model_creation():
     """Test that the model can be created properly with Mesa 3.x"""
     print("\n--- Testing Model Creation ---")
-    
+
     # Print Mesa version
     print(f"Using Mesa version: {mesa.__version__}")
-    
+
     # Create the model
     print("Creating Sugarscape model...")
     model = SugarscapeMesa(10, width=10, height=10)
-    
+
     # Count agents with isinstance
     total_agents = len(model.agents)
     ant_count = sum(1 for agent in model.agents if isinstance(agent, AntMesa))
     sugar_count = sum(1 for agent in model.agents if isinstance(agent, Sugar))
-    
+
     print(f"Total agents: {total_agents}")
     print(f"AntMesa agents: {ant_count}")
     print(f"Sugar agents: {sugar_count}")
-    
+
     # Check that we have the expected number of agents
-    assert total_agents == (10*10 + 10), "Unexpected total agent count"
+    assert total_agents == (10 * 10 + 10), "Unexpected total agent count"
     assert ant_count == 10, "Unexpected AntMesa agent count"
-    assert sugar_count == 10*10, "Unexpected Sugar agent count"
-    
+    assert sugar_count == 10 * 10, "Unexpected Sugar agent count"
+
     # Show some of the agents
     print("\nSample of agents in model:")
     for i, agent in enumerate(model.agents):
@@ -37,7 +37,7 @@ def test_model_creation():
         else:
             print("...")
             break
-    
+
     print("Model creation test passed!")
     return model
 
@@ -45,38 +45,38 @@ def test_model_creation():
 def test_model_step(model):
     """Test that the model can be stepped with Mesa 3.x"""
     print("\n--- Testing Model Step ---")
-    
+
     # Count agents before stepping
     ant_count_before = sum(1 for agent in model.agents if isinstance(agent, AntMesa))
     print(f"AntMesa agents before step: {ant_count_before}")
-    
+
     # Step the model
     print("Running one step...")
     try:
         model.step()
         print("Step completed successfully!")
-        
+
         # Count agents after stepping
         ant_count_after = sum(1 for agent in model.agents if isinstance(agent, AntMesa))
         print(f"AntMesa agents after step: {ant_count_after}")
-        
+
     except Exception as e:
         print(f"Error running step: {e}")
         assert False, f"Model step failed: {e}"
-    
+
     print("Model step test passed!")
 
 
 def test_simple_model():
     """Test a simplified model with just a few agents to isolate behavior"""
     print("\n--- Testing Simple Model ---")
-    
+
     # Create a simpler model
     class SimpleModel(mesa.Model):
         def __init__(self, seed=None):
             super().__init__(seed=seed)
             self.space = mesa.space.MultiGrid(5, 5, torus=False)
-            
+
             # Add sugar agents to all cells
             self.sugars = []
             for x in range(5):
@@ -84,31 +84,31 @@ def __init__(self, seed=None):
                     sugar = Sugar(self, 5)
                     self.space.place_agent(sugar, (x, y))
                     self.sugars.append(sugar)
-            
+
             # Create one ant agent
             self.ant = AntMesa(self, False, 10, 2, 3)
             self.space.place_agent(self.ant, (2, 2))  # Place in the middle
-        
+
         def step(self):
             # Step the sugar agents
             for sugar in self.sugars:
                 sugar.step()
-            
+
             # Step the ant agent
             self.ant.step()
-    
+
     # Create and test
     print("Creating simple model...")
     simple_model = SimpleModel()
     print("Created model")
-    
+
     # Check agents
     print(f"Agents in model: {len(simple_model.agents)}")
     ant_count = sum(1 for agent in simple_model.agents if isinstance(agent, AntMesa))
     sugar_count = sum(1 for agent in simple_model.agents if isinstance(agent, Sugar))
     print(f"AntMesa agents: {ant_count}")
     print(f"Sugar agents: {sugar_count}")
-    
+
     # Try to step sugar agents directly
     print("\nStepping sugar agents directly...")
     try:
@@ -118,7 +118,7 @@ def step(self):
     except Exception as e:
         print(f"Error stepping sugar: {e}")
         assert False, f"Sugar step failed: {e}"
-    
+
     # Try to step ant agent directly
     print("\nStepping ant agent directly...")
     try:
@@ -127,7 +127,7 @@ def step(self):
     except Exception as e:
         print(f"Error stepping ant: {e}")
         assert False, f"Ant step failed: {e}"
-    
+
     # Try to step the model
     print("\nStepping simple model...")
     try:
@@ -136,7 +136,7 @@ def step(self):
     except Exception as e:
         print(f"Error stepping model: {e}")
         assert False, f"Simple model step failed: {e}"
-    
+
     print("Simple model test passed!")
 
 
@@ -145,13 +145,13 @@ def run_tests():
     try:
         # Test 1: Model Creation
         model = test_model_creation()
-        
+
         # Test 2: Model Step
         test_model_step(model)
-        
+
         # Test 3: Simple Model
         test_simple_model()
-        
+
         print("\n--- All Tests Passed Successfully! ---")
         print(f"The Sugarscape model is working correctly with Mesa {mesa.__version__}")
         return True
@@ -162,4 +162,4 @@ def run_tests():
 
 if __name__ == "__main__":
     success = run_tests()
-    sys.exit(0 if success else 1) 
\ No newline at end of file
+    sys.exit(0 if success else 1)

From ad592e544eb222d4afe99e2eb5664b69c62c1011 Mon Sep 17 00:00:00 2001
From: Suryansh Garg <133861447+suryanshgargbpgc@users.noreply.github.com>
Date: Mon, 24 Mar 2025 01:27:58 +0530
Subject: [PATCH 03/11] Fix Sugarscape example compatibility with Mesa 3.0 and
 Python 3.10

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 680deb77..5a326c79 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -88,7 +88,7 @@ test = [
 
 dev = [
   "mesa_frames[test, docs]",
-  "mesa~=3.1.0",
+  "mesa~=3.0.0",
   "numba",
 ]
 

From 168c35cb7a537b50b83dc0d3b93cf355e1e0795a Mon Sep 17 00:00:00 2001
From: Suryansh Garg <133861447+suryanshgargbpgc@users.noreply.github.com>
Date: Wed, 26 Mar 2025 02:21:11 +0530
Subject: [PATCH 04/11] update sugarscape example with pytest implementation

---
 .gitignore                                |   8 +-
 examples/sugarscape_ig/sugarscape_test.py | 174 +++++++++-------------
 examples/sugarscape_ig/test_results.txt   |   5 -
 pyproject.toml                            |   7 +-
 4 files changed, 81 insertions(+), 113 deletions(-)
 delete mode 100644 examples/sugarscape_ig/test_results.txt

diff --git a/.gitignore b/.gitignore
index 21cbfdcf..56c1df45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,4 +152,10 @@ cython_debug/
 .idea/
 
 .vscode/
-*.code-workspace
\ No newline at end of file
+*.code-workspace
+
+# Test result files
+test_results.txt
+*_test_results.txt
+test_output.txt
+*_test_output.txt
\ No newline at end of file
diff --git a/examples/sugarscape_ig/sugarscape_test.py b/examples/sugarscape_ig/sugarscape_test.py
index 9c90c2e4..80877970 100644
--- a/examples/sugarscape_ig/sugarscape_test.py
+++ b/examples/sugarscape_ig/sugarscape_test.py
@@ -1,77 +1,73 @@
-import mesa
+"""
+Pytest tests for the Sugarscape example with Mesa 3.x.
+"""
+
 import sys
+import os
+from pathlib import Path
+
+# Add the parent directory to sys.path to allow imports from ss_mesa package
+current_dir = Path(__file__).parent
+examples_dir = current_dir.parent
+root_dir = examples_dir.parent
+
+# Add root directory to sys.path if not already there
+if str(root_dir) not in sys.path:
+    sys.path.insert(0, str(root_dir))
+
+# Add the examples directory to sys.path if not already there
+if str(examples_dir) not in sys.path:
+    sys.path.insert(0, str(examples_dir))
+
+import mesa
+import pytest
 from ss_mesa.model import SugarscapeMesa
 from ss_mesa.agents import AntMesa, Sugar
 
 
-def test_model_creation():
-    """Test that the model can be created properly with Mesa 3.x"""
-    print("\n--- Testing Model Creation ---")
+@pytest.fixture
+def sugarscape_model():
+    """Create a standard Sugarscape model for testing."""
+    return SugarscapeMesa(10, width=10, height=10)
 
-    # Print Mesa version
-    print(f"Using Mesa version: {mesa.__version__}")
 
-    # Create the model
-    print("Creating Sugarscape model...")
-    model = SugarscapeMesa(10, width=10, height=10)
+def test_model_creation(sugarscape_model):
+    """Test that the model can be created properly with Mesa 3.x"""
+    model = sugarscape_model
 
     # Count agents with isinstance
     total_agents = len(model.agents)
     ant_count = sum(1 for agent in model.agents if isinstance(agent, AntMesa))
     sugar_count = sum(1 for agent in model.agents if isinstance(agent, Sugar))
 
-    print(f"Total agents: {total_agents}")
-    print(f"AntMesa agents: {ant_count}")
-    print(f"Sugar agents: {sugar_count}")
-
     # Check that we have the expected number of agents
     assert total_agents == (10 * 10 + 10), "Unexpected total agent count"
     assert ant_count == 10, "Unexpected AntMesa agent count"
     assert sugar_count == 10 * 10, "Unexpected Sugar agent count"
 
-    # Show some of the agents
-    print("\nSample of agents in model:")
-    for i, agent in enumerate(model.agents):
-        if i < 5:
-            print(f"Agent {i} - Type: {type(agent).__name__}, ID: {agent.unique_id}")
-        else:
-            print("...")
-            break
-
-    print("Model creation test passed!")
-    return model
 
-
-def test_model_step(model):
+def test_model_step(sugarscape_model):
     """Test that the model can be stepped with Mesa 3.x"""
-    print("\n--- Testing Model Step ---")
+    model = sugarscape_model
 
     # Count agents before stepping
     ant_count_before = sum(1 for agent in model.agents if isinstance(agent, AntMesa))
-    print(f"AntMesa agents before step: {ant_count_before}")
 
     # Step the model
-    print("Running one step...")
-    try:
-        model.step()
-        print("Step completed successfully!")
-
-        # Count agents after stepping
-        ant_count_after = sum(1 for agent in model.agents if isinstance(agent, AntMesa))
-        print(f"AntMesa agents after step: {ant_count_after}")
+    model.step()
 
-    except Exception as e:
-        print(f"Error running step: {e}")
-        assert False, f"Model step failed: {e}"
+    # Count agents after stepping
+    ant_count_after = sum(1 for agent in model.agents if isinstance(agent, AntMesa))
 
-    print("Model step test passed!")
+    # In this basic test, we just verify the step completes without errors
+    # and the number of ants doesn't unexpectedly change
+    assert ant_count_after >= 0, "Expected at least some ants to survive"
 
 
-def test_simple_model():
-    """Test a simplified model with just a few agents to isolate behavior"""
-    print("\n--- Testing Simple Model ---")
+@pytest.fixture
+def simple_model():
+    """Create a simplified model with just a few agents to isolate behavior"""
 
-    # Create a simpler model
     class SimpleModel(mesa.Model):
         def __init__(self, seed=None):
             super().__init__(seed=seed)
@@ -97,69 +93,35 @@ def step(self):
             # Step the ant agent
             self.ant.step()
 
-    # Create and test
-    print("Creating simple model...")
-    simple_model = SimpleModel()
-    print("Created model")
+    return SimpleModel()
+
 
+def test_simple_model_creation(simple_model):
+    """Test that the simple model is created with the correct agents."""
     # Check agents
-    print(f"Agents in model: {len(simple_model.agents)}")
+    assert len(simple_model.agents) == 26, "Expected 26 total agents (25 sugar + 1 ant)"
+
     ant_count = sum(1 for agent in simple_model.agents if isinstance(agent, AntMesa))
     sugar_count = sum(1 for agent in simple_model.agents if isinstance(agent, Sugar))
-    print(f"AntMesa agents: {ant_count}")
-    print(f"Sugar agents: {sugar_count}")
-
-    # Try to step sugar agents directly
-    print("\nStepping sugar agents directly...")
-    try:
-        for sugar in simple_model.sugars:
-            sugar.step()
-        print("Sugar steps successful!")
-    except Exception as e:
-        print(f"Error stepping sugar: {e}")
-        assert False, f"Sugar step failed: {e}"
-
-    # Try to step ant agent directly
-    print("\nStepping ant agent directly...")
-    try:
-        simple_model.ant.step()
-        print("Ant step successful!")
-    except Exception as e:
-        print(f"Error stepping ant: {e}")
-        assert False, f"Ant step failed: {e}"
-
-    # Try to step the model
-    print("\nStepping simple model...")
-    try:
-        simple_model.step()
-        print("Model step successful!")
-    except Exception as e:
-        print(f"Error stepping model: {e}")
-        assert False, f"Simple model step failed: {e}"
-
-    print("Simple model test passed!")
-
-
-def run_tests():
-    """Run all tests in sequence"""
-    try:
-        # Test 1: Model Creation
-        model = test_model_creation()
-
-        # Test 2: Model Step
-        test_model_step(model)
-
-        # Test 3: Simple Model
-        test_simple_model()
-
-        print("\n--- All Tests Passed Successfully! ---")
-        print(f"The Sugarscape model is working correctly with Mesa {mesa.__version__}")
-        return True
-    except AssertionError as e:
-        print(f"\nTest failed: {e}")
-        return False
-
-
-if __name__ == "__main__":
-    success = run_tests()
-    sys.exit(0 if success else 1)
+
+    assert ant_count == 1, "Expected exactly 1 AntMesa agent"
+    assert sugar_count == 25, "Expected exactly 25 Sugar agents"
+
+
+def test_sugar_step(simple_model):
+    """Test that sugar agents can step without errors."""
+    for sugar in simple_model.sugars:
+        sugar.step()
+    # If we get here without exceptions, the test passes
+
+
+def test_ant_step(simple_model):
+    """Test that ant agents can step without errors."""
+    simple_model.ant.step()
+    # If we get here without exceptions, the test passes
+
+
+def test_simple_model_step(simple_model):
+    """Test that the simple model can step without errors."""
+    simple_model.step()
+    # If we get here without exceptions, the test passes
diff --git a/examples/sugarscape_ig/test_results.txt b/examples/sugarscape_ig/test_results.txt
deleted file mode 100644
index 30cfcf72..00000000
--- a/examples/sugarscape_ig/test_results.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Mesa version: 3.1.4
-
-Creating Sugarscape model...
-Created model with 50 AntMesa agents
-Successfully ran the Sugarscape model with Mesa 3.x!
diff --git a/pyproject.toml b/pyproject.toml
index 5a326c79..96878de0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -88,7 +88,7 @@ test = [
 
 dev = [
   "mesa_frames[test, docs]",
-  "mesa~=3.0.0",
+  "mesa>=3.1.4",
   "numba",
 ]
 
@@ -124,3 +124,8 @@ dev = [
     "mesa-frames[dev]",
 ]
 
+[tool.pytest.ini_options]
+testpaths = ["tests", "examples"]
+python_files = ["test_*.py", "*_test.py", "sugarscape_test.py"]
+addopts = "--verbose"
+

From 9fd253f6b57bee48010fb07a1a6cac0463e8a384 Mon Sep 17 00:00:00 2001
From: Suryansh Garg <133861447+suryanshgargbpgc@users.noreply.github.com>
Date: Thu, 27 Mar 2025 06:15:49 +0530
Subject: [PATCH 05/11] Update pyproject.toml

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 96878de0..ccf77c89 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -88,7 +88,8 @@ test = [
 
 dev = [
   "mesa_frames[test, docs]",
-  "mesa>=3.1.4",
+  "mesa>=3.1.4; python_version >= '3.11'",
+  "mesa~=3.0.0; python_version < '3.11'",
   "numba",
 ]
 

From d8b85f63c450af9ee88b9006b1659fc40f69f28c Mon Sep 17 00:00:00 2001
From: Adam Amer <136176500+adamamer20@users.noreply.github.com>
Date: Thu, 3 Apr 2025 14:30:16 +0200
Subject: [PATCH 06/11] change minimum python version to 3.11

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index ccf77c89..dfa54a00 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,7 +43,7 @@ dependencies = [
   "polars>=1.0.0", #polars._typing (see mesa_frames.types) added in 1.0.0
   #"geopolars" (currently in pre-alpha)
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 dynamic = [
   "version"
 ]

From c6536dd32465d8c8c32f9762d96ddb343f521f61 Mon Sep 17 00:00:00 2001
From: Suryansh Garg <133861447+suryanshgargbpgc@users.noreply.github.com>
Date: Fri, 4 Apr 2025 08:40:22 +0530
Subject: [PATCH 07/11] Convert Numba acceleration doc to Jupyter notebook as
 requested in PR review

---
 pyproject.toml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index dfa54a00..1c8d7c57 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -87,10 +87,13 @@ test = [
 ]
 
 dev = [
-  "mesa_frames[test, docs]",
-  "mesa>=3.1.4; python_version >= '3.11'",
-  "mesa~=3.0.0; python_version < '3.11'",
-  "numba",
+  "mesa_frames[test, docs, numba]",
+  "mesa>=2.4.0",
+  "numba>=0.60",
+]
+
+numba = [
+  "numba>=0.60",
 ]
 
 [tool.hatch.envs.test]

From b69677903dd0720592c668ba9ea2bdd6a3875c1e Mon Sep 17 00:00:00 2001
From: Suryansh Garg <133861447+suryanshgargbpgc@users.noreply.github.com>
Date: Fri, 4 Apr 2025 08:43:27 +0530
Subject: [PATCH 08/11] Update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c26704fd..77436dc0 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,5 +4,15 @@ contact_links:
     url: https://github.com/projectmesa/mesa-frames/discussions
     about: Discuss Mesa-Frames, ask questions, do discussions, share ideas, and showcase your projects
 
+dev = [
+  "mesa_frames[test, docs, numba]",
+  "mesa>=2.4.0",
+  "numba>=0.60",
+]
+
+numba = [
+  "numba>=0.60",
+]
+
 
 

From 2085e38ddd053397dde3f6e1393ed8dd08538403 Mon Sep 17 00:00:00 2001
From: Suryansh Garg <133861447+suryanshgargbpgc@users.noreply.github.com>
Date: Fri, 4 Apr 2025 08:48:33 +0530
Subject: [PATCH 09/11] upgrade pyproject.toml

---
 examples/sugarscape_ig/ss_mesa/model.py | 4 +---
 pyproject.toml                          | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/examples/sugarscape_ig/ss_mesa/model.py b/examples/sugarscape_ig/ss_mesa/model.py
index 2a7f5706..3fb576bd 100644
--- a/examples/sugarscape_ig/ss_mesa/model.py
+++ b/examples/sugarscape_ig/ss_mesa/model.py
@@ -42,7 +42,6 @@ def __init__(
         self.width, self.height = sugar_grid.shape
         self.n_agents = n_agents
         self.space = mesa.space.MultiGrid(self.width, self.height, torus=False)
-        self.sugars = []
 
         # Create sugar resources
         sugar_count = 0
@@ -50,7 +49,6 @@ def __init__(
             max_sugar = sugar_grid[x, y]
             sugar = Sugar(self, max_sugar)
             self.space.place_agent(sugar, (x, y))
-            self.sugars.append(sugar)
             sugar_count += 1
 
         # Create AntMesa agents
@@ -89,7 +87,7 @@ def step(self):
             ant.step()
 
         # Process Sugar agents directly
-        for sugar in self.sugars:
+        for sugar in [agent for agent in self.agents if isinstance(agent, Sugar)]:
             sugar.step()
 
     def run_model(self, step_count=200):
diff --git a/pyproject.toml b/pyproject.toml
index 1c8d7c57..0cb7f6b4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -87,9 +87,9 @@ test = [
 ]
 
 dev = [
-  "mesa_frames[test, docs, numba]",
-  "mesa>=2.4.0",
-  "numba>=0.60",
+  "mesa_frames[test, docs]",
+  "mesa>=3.1.5",
+  "numba",
 ]
 
 numba = [

From aadfc4bd077e2408e7023b908fcdd8032dc4b034 Mon Sep 17 00:00:00 2001
From: Suryansh Garg <133861447+suryanshgargbpgc@users.noreply.github.com>
Date: Fri, 4 Apr 2025 08:53:26 +0530
Subject: [PATCH 10/11] Update config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 77436dc0..de9debb4 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,16 +3,3 @@ contact_links:
   - name: Discussions/Questions etc
     url: https://github.com/projectmesa/mesa-frames/discussions
     about: Discuss Mesa-Frames, ask questions, do discussions, share ideas, and showcase your projects
-
-dev = [
-  "mesa_frames[test, docs, numba]",
-  "mesa>=2.4.0",
-  "numba>=0.60",
-]
-
-numba = [
-  "numba>=0.60",
-]
-
-
-

From 9f219e9debb8c1b96b18f7408f621fe7004aa9bd Mon Sep 17 00:00:00 2001
From: Suryansh Garg <133861447+suryanshgargbpgc@users.noreply.github.com>
Date: Fri, 4 Apr 2025 09:03:37 +0530
Subject: [PATCH 11/11] Update pyproject.toml

---
 pyproject.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0cb7f6b4..1c8d7c57 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -87,9 +87,9 @@ test = [
 ]
 
 dev = [
-  "mesa_frames[test, docs]",
-  "mesa>=3.1.5",
-  "numba",
+  "mesa_frames[test, docs, numba]",
+  "mesa>=2.4.0",
+  "numba>=0.60",
 ]
 
 numba = [