Mesa 3.0.3__tar.gz → 3.1.0.dev0__tar.gz

{mesa-3.0.3 → mesa-3.1.0.dev0}/.github/workflows/build_lint.yml

@@ -37,8 +37,6 @@ jobs:
             python-version: "3.12"
           - os: ubuntu
             python-version: "3.11"
-          - os: ubuntu
-            python-version: "3.10"
           # Disabled for now. See https://github.com/projectmesa/mesa/issues/1253
           #- os: ubuntu
           #  python-version: 'pypy-3.8'

{mesa-3.0.3 → mesa-3.1.0.dev0}/.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
     rev: v3.19.0
     hooks:
     -   id: pyupgrade
-        args: [--py310-plus]
+        args: [--py311-plus]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0  # Use the ref you want to point at
     hooks:

{mesa-3.0.3 → mesa-3.1.0.dev0}/HISTORY.md

@@ -1,24 +1,6 @@
 ---
 title: Release History
 ---
-# 3.0.2 (2024-11-11)
-## Highlighst
-Mesa 3.0.2 is a small follow-up patch release, in which we fixed a lot of small bugs in the example models their visualisation, and improved their testing.
-
-## What's Changed
-### 🐛 Bugs fixed
-* allow components as a positional argument again by @Corvince in https://github.com/projectmesa/mesa/pull/2488
-### 🔍 Examples updated
-* examples: Add required components keyword by @EwoutH in https://github.com/projectmesa/mesa/pull/2485
-* examples: Fix boid_flockers viz by @EwoutH in https://github.com/projectmesa/mesa/pull/2492
-* examples: Fix schelling viz by @EwoutH in https://github.com/projectmesa/mesa/pull/2490
-* example: Add input sliders to Sugerscape viz by @EwoutH in https://github.com/projectmesa/mesa/pull/2487
-* examples/gol: Add initial fraction alive, add sliders to viz by @EwoutH in https://github.com/projectmesa/mesa/pull/2489
-### 🔧 Maintenance
-* test app init of examples by @Corvince in https://github.com/projectmesa/mesa/pull/2491
-
-**Full Changelog**: https://github.com/projectmesa/mesa/compare/v3.0.1...v3.0.2
-
 # 3.0.1 (2024-11-11)
 ## Highlights
 After our huge [3.0.0 release](https://github.com/projectmesa/mesa/releases/tag/v3.0.0), Mesa 3.0.1 follows up with two improvements to experimental features, examples and docs.

{mesa-3.0.3 → mesa-3.1.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: Mesa
-Version: 3.0.3
+Version: 3.1.0.dev0
 Summary: Agent-based modeling (ABM) in Python
 Project-URL: homepage, https://github.com/projectmesa/mesa
 Project-URL: repository, https://github.com/projectmesa/mesa
@@ -13,14 +13,13 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Scientific/Engineering :: Artificial Life
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: tqdm
@@ -81,7 +80,7 @@ Description-Content-Type: text/markdown
 | --- | --- |
 | CI/CD | [![GitHub Actions build status](https://github.com/projectmesa/mesa/workflows/build/badge.svg)](https://github.com/projectmesa/mesa/actions) [![Coverage status](https://codecov.io/gh/projectmesa/mesa/branch/main/graph/badge.svg)](https://codecov.io/gh/projectmesa/mesa) |
 | Package | [![PyPI - Version](https://img.shields.io/pypi/v/mesa.svg?logo=pypi&label=PyPI&logoColor=gold)](https://pypi.org/project/Mesa/) [![PyPI - Downloads](https://img.shields.io/pypi/dm/mesa.svg?color=blue&label=Downloads&logo=pypi&logoColor=gold)](https://pypi.org/project/Mesa/) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/mesa.svg?logo=python&label=Python&logoColor=gold)](https://pypi.org/project/Mesa/) |
-| Meta | [![linting - Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch) |
+| Meta | [![linting - Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch) [![SPEC 0 — Minimum Supported Dependencies](https://img.shields.io/badge/SPEC-0-green?labelColor=%23004811&color=%235CA038)](https://scientific-python.org/specs/spec-0000/) |
 | Chat | [![chat](https://img.shields.io/matrix/project-mesa:matrix.org?label=chat&logo=Matrix)](https://matrix.to/#/#project-mesa:matrix.org) |
 
 Mesa allows users to quickly create agent-based models using built-in

{mesa-3.0.3 → mesa-3.1.0.dev0}/README.md

@@ -4,7 +4,7 @@
 | --- | --- |
 | CI/CD | [![GitHub Actions build status](https://github.com/projectmesa/mesa/workflows/build/badge.svg)](https://github.com/projectmesa/mesa/actions) [![Coverage status](https://codecov.io/gh/projectmesa/mesa/branch/main/graph/badge.svg)](https://codecov.io/gh/projectmesa/mesa) |
 | Package | [![PyPI - Version](https://img.shields.io/pypi/v/mesa.svg?logo=pypi&label=PyPI&logoColor=gold)](https://pypi.org/project/Mesa/) [![PyPI - Downloads](https://img.shields.io/pypi/dm/mesa.svg?color=blue&label=Downloads&logo=pypi&logoColor=gold)](https://pypi.org/project/Mesa/) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/mesa.svg?logo=python&label=Python&logoColor=gold)](https://pypi.org/project/Mesa/) |
-| Meta | [![linting - Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch) |
+| Meta | [![linting - Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch) [![SPEC 0 — Minimum Supported Dependencies](https://img.shields.io/badge/SPEC-0-green?labelColor=%23004811&color=%235CA038)](https://scientific-python.org/specs/spec-0000/) |
 | Chat | [![chat](https://img.shields.io/matrix/project-mesa:matrix.org?label=chat&logo=Matrix)](https://matrix.to/#/#project-mesa:matrix.org) |
 
 Mesa allows users to quickly create agent-based models using built-in

{mesa-3.0.3 → mesa-3.1.0.dev0}/docs/mesa.md

@@ -56,16 +56,6 @@
     :show-inheritance:
 ```
 
-## mesa.time module
-
-```{eval-rst}
-.. automodule:: mesa.time
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-```
-
 ## Module contents
 
 ```{eval-rst}

{mesa-3.0.3 → mesa-3.1.0.dev0}/docs/tutorials/intro_tutorial.ipynb

@@ -77,7 +77,7 @@
    "source": [
     "### Tutorial Setup\n",
     "\n",
-    "Create and activate a [virtual environment](http://docs.python-guide.org/en/latest/dev/virtualenvs/). *Python version 3.10 or higher is required*.\n",
+    "Create and activate a [virtual environment](http://docs.python-guide.org/en/latest/dev/virtualenvs/). *Python version 3.11 or higher is required*.\n",
     "\n",
     "Install Mesa:\n",
     "\n",

{mesa-3.0.3 → mesa-3.1.0.dev0}/mesa/__init__.py

@@ -7,7 +7,6 @@ import datetime
 
 import mesa.experimental as experimental
 import mesa.space as space
-import mesa.time as time
 from mesa.agent import Agent
 from mesa.batchrunner import batch_run
 from mesa.datacollection import DataCollector
@@ -16,7 +15,6 @@ from mesa.model import Model
 __all__ = [
     "Model",
     "Agent",
-    "time",
     "space",
     "DataCollector",
     "batch_run",
@@ -24,7 +22,7 @@ __all__ = [
 ]
 
 __title__ = "mesa"
-__version__ = "3.0.3"
+__version__ = "3.1.0.dev"
 __license__ = "Apache 2.0"
-_this_year = datetime.datetime.now(tz=datetime.timezone.utc).date().year
+_this_year = datetime.datetime.now(tz=datetime.UTC).date().year
 __copyright__ = f"Copyright {_this_year} Project Mesa Team"

{mesa-3.0.3 → mesa-3.1.0.dev0}/mesa/agent.py

@@ -155,7 +155,6 @@ class AgentSet(MutableSet, Sequence):
         at_most: int | float = float("inf"),
         inplace: bool = False,
         agent_type: type[Agent] | None = None,
-        n: int | None = None,
     ) -> AgentSet:
         """Select a subset of agents from the AgentSet based on a filter function and/or quantity limit.
 
@@ -167,7 +166,6 @@ class AgentSet(MutableSet, Sequence):
               - If a float between 0 and 1, at most that fraction of original the agents are selected.
             inplace (bool, optional): If True, modifies the current AgentSet; otherwise, returns a new AgentSet. Defaults to False.
             agent_type (type[Agent], optional): The class type of the agents to select. Defaults to None, meaning no type filtering is applied.
-            n (int): deprecated, use at_most instead
 
         Returns:
             AgentSet: A new AgentSet containing the selected agents, unless inplace is True, in which case the current AgentSet is updated.
@@ -176,14 +174,6 @@ class AgentSet(MutableSet, Sequence):
             - at_most just return the first n or fraction of agents. To take a random sample, shuffle() beforehand.
             - at_most is an upper limit. When specifying other criteria, the number of agents returned can be smaller.
         """
-        if n is not None:
-            warnings.warn(
-                "The parameter 'n' is deprecated and will be removed in Mesa 3.1. Use 'at_most' instead.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            at_most = n
-
         inf = float("inf")
         if filter_func is None and agent_type is None and at_most == inf:
             return self if inplace else copy.copy(self)
@@ -281,21 +271,6 @@ class AgentSet(MutableSet, Sequence):
         Returns:
             AgentSet | list[Any]: The results of the callable calls if return_results is True, otherwise the AgentSet itself.
         """
-        try:
-            return_results = kwargs.pop("return_results")
-        except KeyError:
-            return_results = False
-        else:
-            warnings.warn(
-                "Using return_results is deprecated and will be removed in Mesa 3.1."
-                "Use AgenSet.do in case of return_results=False, and AgentSet.map in case of return_results=True",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-
-        if return_results:
-            return self.map(method, *args, **kwargs)
-
         # we iterate over the actual weakref keys and check if weakref is alive before calling the method
         if isinstance(method, str):
             for agentref in self._agents.keyrefs():

{mesa-3.0.3 → mesa-3.1.0.dev0}/mesa/experimental/cell_space/cell_collection.py

@@ -48,10 +48,8 @@ class CellCollection(Generic[T]):
         else:
             self._cells = {cell: cell.agents for cell in cells}
 
-        # Get capacity from first cell if collection is not empty
-        self._capacity: int | None = (
-            next(iter(self._cells.keys())).capacity if self._cells else None
-        )
+        #
+        self._capacity: int = next(iter(self._cells.keys())).capacity
 
         if random is None:
             warnings.warn(

{mesa-3.0.3 → mesa-3.1.0.dev0}/mesa/model.py

@@ -18,7 +18,6 @@ from typing import Any
 import numpy as np
 
 from mesa.agent import Agent, AgentSet
-from mesa.datacollection import DataCollector
 
 SeedLike = int | np.integer | Sequence[int] | np.random.SeedSequence
 RNGLike = np.random.Generator | np.random.BitGenerator
@@ -112,14 +111,6 @@ class Model:
         # Call the original user-defined step method
         self._user_step(*args, **kwargs)
 
-    def next_id(self) -> int:  # noqa: D102
-        warnings.warn(
-            "using model.next_id() is deprecated and will be removed in Mesa 3.1. Agents track their unique ID automatically",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return 0
-
     @property
     def agents(self) -> AgentSet:
         """Provides an AgentSet of all agents in the model, combining agents from all types."""
@@ -143,16 +134,6 @@ class Model:
         """A dictionary where the keys are agent types and the values are the corresponding AgentSets."""
         return self._agents_by_type
 
-    def get_agents_of_type(self, agenttype: type[Agent]) -> AgentSet:
-        """Deprecated: Retrieves an AgentSet containing all agents of the specified type."""
-        warnings.warn(
-            f"Model.get_agents_of_type() is deprecated and will be removed in Mesa 3.1."
-            f"Please replace get_agents_of_type({agenttype}) with the property agents_by_type[{agenttype}].",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.agents_by_type[agenttype]
-
     def _setup_agent_registration(self):
         """Helper method to initialize the agent registration datastructures."""
         self._agents = {}  # the hard references to all agents in the model
@@ -245,38 +226,6 @@ class Model:
         self.rng = np.random.default_rng(rng)
         self._rng = self.rng.bit_generator.state
 
-    def initialize_data_collector(
-        self,
-        model_reporters=None,
-        agent_reporters=None,
-        agenttype_reporters=None,
-        tables=None,
-    ) -> None:
-        """Initialize the data collector for the model.
-
-        Args:
-            model_reporters: model reporters to collect
-            agent_reporters: agent reporters to collect
-            agenttype_reporters: agent type reporters to collect
-            tables: tables to collect
-
-        """
-        warnings.warn(
-            "initialize_data_collector() is deprecated and will be removed in Mesa 3.1. Please use the DataCollector class directly. "
-            "by using `self.datacollector = DataCollector(...)`.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-        self.datacollector = DataCollector(
-            model_reporters=model_reporters,
-            agent_reporters=agent_reporters,
-            agenttype_reporters=agenttype_reporters,
-            tables=tables,
-        )
-        # Collect data for the first time during initialization.
-        self.datacollector.collect(self)
-
     def remove_all_agents(self):
         """Remove all agents from the model.
 

{mesa-3.0.3 → mesa-3.1.0.dev0}/mesa/visualization/solara_viz.py

@@ -382,17 +382,11 @@ def ModelCreator(
     )
     user_params, fixed_params = split_model_params(user_params)
 
-    # Use solara.use_effect to run the initialization code only once
-    solara.use_effect(
-        # set model_parameters to the default values for all parameters
-        lambda: model_parameters.set(
-            {
-                **fixed_params,
-                **{k: v.get("value") for k, v in user_params.items()},
-            }
-        ),
-        [],
-    )
+    # set model_parameters to the default values for all parameters
+    model_parameters.value = {
+        **fixed_params,
+        **{k: v.get("value") for k, v in user_params.items()},
+    }
 
     def on_change(name, value):
         model_parameters.value = {**model_parameters.value, name: value}

{mesa-3.0.3 → mesa-3.1.0.dev0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 name = "Mesa"
 description = "Agent-based modeling (ABM) in Python"
 license = { text = "Apache 2.0" }
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 authors = [
   { name = "Project Mesa Team", email = "projectmesa@googlegroups.com" },
 ]
@@ -25,7 +25,6 @@ classifiers = [
   "Topic :: Scientific/Engineering :: Artificial Intelligence",
   "Intended Audience :: Science/Research",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
@@ -93,9 +92,9 @@ path = "mesa/__init__.py"
 
 [tool.ruff]
 # See https://github.com/charliermarsh/ruff#rules for error code definitions.
-# Hardcode to Python 3.10.
+# Hardcode to Python 3.11.
 # Reminder to update mesa-examples if the value below is changed.
-target-version = "py310"
+target-version = "py311"
 extend-exclude = ["docs", "build"]
 
 [tool.ruff.lint]

{mesa-3.0.3 → mesa-3.1.0.dev0}/tests/test_cell_space.py

@@ -583,40 +583,6 @@ def test_cell_collection():
     assert len(cells) == len(collection)
 
 
-def test_empty_cell_collection():
-    """Test that CellCollection properly handles empty collections."""
-    rng = random.Random(42)
-
-    # Test initializing with empty collection
-    collection = CellCollection([], random=rng)
-    assert len(collection) == 0
-    assert collection._capacity is None
-    assert list(collection.cells) == []
-    assert list(collection.agents) == []
-
-    # Test selecting from empty collection
-    selected = collection.select(lambda cell: True)
-    assert len(selected) == 0
-    assert selected._capacity is None
-
-    # Test filtering to empty collection
-    n = 10
-    full_collection = CellCollection(
-        [Cell((i,), random=rng) for i in range(n)], random=rng
-    )
-    assert len(full_collection) == n
-
-    # Filter to empty collection
-    empty_result = full_collection.select(lambda cell: False)
-    assert len(empty_result) == 0
-    assert empty_result._capacity is None
-
-    # Test at_most with empty collection
-    at_most_result = full_collection.select(lambda cell: False, at_most=5)
-    assert len(at_most_result) == 0
-    assert at_most_result._capacity is None
-
-
 ### PropertyLayer tests
 def test_property_layer_integration():
     """Test integration of PropertyLayer with DiscrateSpace and Cell."""

{mesa-3.0.3 → mesa-3.1.0.dev0}/tests/test_import_namespace.py

@@ -7,11 +7,6 @@ def test_import():
     See https://github.com/projectmesa/mesa/pull/1294.
     """
     import mesa
-    from mesa.time import RandomActivation
-
-    _ = mesa.time.RandomActivation
-    _ = RandomActivation
-
     from mesa.space import MultiGrid
 
     _ = mesa.space.MultiGrid

mesa-3.0.3/docs/apis/time.md

@@ -1,7 +0,0 @@
-# Time
-
-```{eval-rst}
-.. automodule:: mesa.time
-   :members:
-   :inherited-members:
-```