Mesa 1.1.1__tar.gz → 1.2.0__tar.gz

{Mesa-1.1.1 → Mesa-1.2.0}/HISTORY.rst

@@ -3,6 +3,87 @@
 Release History
 ---------------
 
+
+1.2.0 (2023-03-09) Taylor
+++++++++++++++++++++++++++
+
+**Special notes**
+
+New features:
+
+* Implement radius for NetworkGrid.get_neighbors #1564
+
+Some highlights for the perf improvements:
+
+* Use getattr for attribute strings in model data collection #1590 this is a 2x speedup over the relevant line
+* Faster is_integer function for common cases #1597 is for 1.3x speedup for grid access (grid[x, y])
+* Refactor iter/get_cell_list_contents methods #1570 at least 1.3x speedup for iter/get_cell_list_contents
+* Evaluate empties set more lazily #1546 (comment) ~1.3x speedup for place_agent, remove_agent, and move_agent
+
+**Improvements**
+
+* ci: Add testing on Python 3.11 #1519
+* Remove auto-update GH Actions for Pipfile.lock #1558 
+* ruff
+    * ruff: Add isort #1594
+    * ci: Replace flake8 with Ruff #1587
+    * ruff: Add more rules based on Zulip's config #1596
+* perf: faster is_integer function for common cases #1597
+* Remove _reporter_decorator #1591
+* Change index at DataFrame creation in get_agent_vars_dataframe #1586
+* Make Grid class private #1575
+* Make the internal grid and empties_built in Grid class private #1568
+* Simplify code in ContinuousSpace #1536
+* Improve docstrings of ContinuousSpace #1535
+* Simplify accept_tuple_argument decorator in space.py #1531
+* Enhance schedulers to support intra-step removal of agents #1523
+* perf: Refactor iter_cell_list_contents Performance #1527
+* Replace two loops with dictionary comprehension, list- with generator comprehension #1458
+* Make MultiGrid.place_agent faster #1508
+* Update space module-level docstring summary #1518
+* Update NetworkGrid.__init__ docstring #1514
+* Deprecate SingleGrid.position_agent #1512
+* Make swap_pos part of Grid instead of SingleGrid #1507
+* Refactor NetworkGrid docstrings and iter/get_cell_list_contents #1498
+* Hexgrid: use get_neighborhood in iter_neighbors #1504
+* Auto update year for copyright in docs #1503
+* Refactor Grid.move_to_empty #1482
+* Put "Mesa" instead of "it" in README #1490
+* Batchrunner: Remove unnecessary dict transformation, .keys() in len() #1460
+* Add Dependabot configuration for GitHub Actions update check #1480
+* Use list transformation only when shuffled is True #1478
+* Implement swap_pos #1474
+* Clean up DataCollector #1475
+
+
+**Fixes**
+
+* Update resources in README #1605
+* Fix accident from https://github.com/projectmesa/mesa/pull/1488 #1489
+* pre-commit autoupdate #1598, #1576, #1548, #1494
+* Fix docstring of DataCollector #1592
+* Update Pipfile.lock (dependencies) #1495 #1487
+* build(deps): 
+    * build(deps): bump codecov/codecov-action from 2 to 3  dependencies Pull requests that update a dependency file #1486
+    * build(deps): bump actions/upload-artifact from 2 to 3  dependencies Pull requests that update a dependency file #1485
+    * build(deps): bump peter-evans/create-pull-request from 3 to 4  dependencies Pull requests that update a dependency file #1484
+    * build(deps): bump actions/setup-python from 3 to 4  dependencies Pull requests that update a dependency file #1483
+* Establish reproducibility for NetworkGrid.get_neighbors when radius > 1 #1569
+* Format js code #1554
+* Add some missing const declarations #1549
+* fix tutorial url in examples #1538
+* Update cookiecutter to flat import style. #1525
+* Fix bug in Grid.get_neighborhood #1517
+* Revert changes of #1478 and #1456 #1516
+* Fix return types of some NetworkGrid methods #1505 
+* Update year for copyright #1501
+* Add default_value function to NetworkGrid #1497
+* Remove extraneous spaces from docstrings in modules 2 #1496
+* Remove extraneous spaces from docstrings in modules #1493
+* SingleGrid: Remove extraneous attribute declaration (empties) #1491
+
+
+
 1.1.1 (2022-10-21)
 ++++++++++++++++++
 

{Mesa-1.1.1 → Mesa-1.2.0}/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2021 Core Mesa Team and contributors
+Copyright 2022 Core Mesa Team and contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

{Mesa-1.1.1 → Mesa-1.2.0/Mesa.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Mesa
-Version: 1.1.1
+Version: 1.2.0
 Summary: Agent-based modeling (ABM) in Python 3+
 Home-page: https://github.com/projectmesa/mesa
 Author: Project Mesa Team
@@ -39,7 +39,7 @@ Mesa: Agent-based modeling in Python 3+
 .. image:: https://img.shields.io/matrix/project-mesa:matrix.org?label=chat&logo=Matrix
         :target: https://matrix.to/#/#project-mesa:matrix.org
 
-It allows users to quickly create agent-based models using built-in core components (such as spatial grids and agent schedulers) or customized implementations; visualize them using a browser-based interface; and analyze their results using Python's data analysis tools. Its goal is to be the Python 3-based alternative to NetLogo, Repast, or MASON.
+Mesa allows users to quickly create agent-based models using built-in core components (such as spatial grids and agent schedulers) or customized implementations; visualize them using a browser-based interface; and analyze their results using Python's data analysis tools. Its goal is to be the Python 3-based alternative to NetLogo, Repast, or MASON.
 
 
 .. image:: https://raw.githubusercontent.com/projectmesa/mesa/main/docs/images/Mesa_Screenshot.png
@@ -83,19 +83,21 @@ Or any other (development) branch on this repo or your own fork:
 
     $ pip install -U -e git+https://github.com/YOUR_FORK/mesa@YOUR_BRANCH#egg=mesa
 
-Take a look at the `examples <https://github.com/projectmesa/mesa/tree/main/examples>`_ folder for sample models demonstrating Mesa features.
+For resources or help on using Mesa, check out the following:
 
-For more help on using Mesa, check out the following resources:
-
-* `Intro to Mesa Tutorial`_
-* `Docs`_
-* `Email list for users`_
-* `PyPI`_
+* `Intro to Mesa Tutorial`_ (An introductory model, the Boltzmann Wealth Model, for beginners or those new to Mesa.)
+* `Complexity Explorer Tutorial`_ (An advanced-beginner model, SugarScape with Traders, with instructional videos)
+* `Mesa Examples`_ (A repository of seminal ABMs using Mesa and examples of employing specific Mesa Features)
+* `Docs`_ (Mesa's documentation, API and useful snippets)
+* `Discussions`_ (GitHub threaded discussions about Mesa)
+* `Matrix Chat`_ (Chat Forum via Matrix to talk about Mesa)
 
 .. _`Intro to Mesa Tutorial` : http://mesa.readthedocs.org/en/main/tutorials/intro_tutorial.html
+.. _`Complexity Explorer Tutorial` : https://www.complexityexplorer.org/courses/172-agent-based-models-with-python-an-introduction-to-mesa
+.. _`Mesa Examples` : https://github.com/projectmesa/mesa-examples/tree/main/examples
 .. _`Docs` : http://mesa.readthedocs.org/en/main/
-.. _`Email list for users` : https://groups.google.com/d/forum/projectmesa
-.. _`PyPI` : https://pypi.python.org/pypi/Mesa/
+.. _`Discussions` : https://github.com/projectmesa/mesa/discussions
+.. _`Matrix Chat` : https://matrix.to/#/#project-mesa:matrix.org
 
 Running Mesa in Docker
 ------------------------

{Mesa-1.1.1 → Mesa-1.2.0}/Mesa.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ HISTORY.rst
 LICENSE
 MANIFEST.in
 README.rst
+pyproject.toml
 setup.py
 Mesa.egg-info/PKG-INFO
 Mesa.egg-info/SOURCES.txt

{Mesa-1.1.1 → Mesa-1.2.0}/Mesa.egg-info/requires.txt

@@ -8,8 +8,8 @@ tqdm
 
 [dev]
 black
+ruff
 coverage
-flake8
 pytest>=4.6
 pytest-cov
 sphinx

{Mesa-1.1.1/Mesa.egg-info → Mesa-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Mesa
-Version: 1.1.1
+Version: 1.2.0
 Summary: Agent-based modeling (ABM) in Python 3+
 Home-page: https://github.com/projectmesa/mesa
 Author: Project Mesa Team
@@ -39,7 +39,7 @@ Mesa: Agent-based modeling in Python 3+
 .. image:: https://img.shields.io/matrix/project-mesa:matrix.org?label=chat&logo=Matrix
         :target: https://matrix.to/#/#project-mesa:matrix.org
 
-It allows users to quickly create agent-based models using built-in core components (such as spatial grids and agent schedulers) or customized implementations; visualize them using a browser-based interface; and analyze their results using Python's data analysis tools. Its goal is to be the Python 3-based alternative to NetLogo, Repast, or MASON.
+Mesa allows users to quickly create agent-based models using built-in core components (such as spatial grids and agent schedulers) or customized implementations; visualize them using a browser-based interface; and analyze their results using Python's data analysis tools. Its goal is to be the Python 3-based alternative to NetLogo, Repast, or MASON.
 
 
 .. image:: https://raw.githubusercontent.com/projectmesa/mesa/main/docs/images/Mesa_Screenshot.png
@@ -83,19 +83,21 @@ Or any other (development) branch on this repo or your own fork:
 
     $ pip install -U -e git+https://github.com/YOUR_FORK/mesa@YOUR_BRANCH#egg=mesa
 
-Take a look at the `examples <https://github.com/projectmesa/mesa/tree/main/examples>`_ folder for sample models demonstrating Mesa features.
+For resources or help on using Mesa, check out the following:
 
-For more help on using Mesa, check out the following resources:
-
-* `Intro to Mesa Tutorial`_
-* `Docs`_
-* `Email list for users`_
-* `PyPI`_
+* `Intro to Mesa Tutorial`_ (An introductory model, the Boltzmann Wealth Model, for beginners or those new to Mesa.)
+* `Complexity Explorer Tutorial`_ (An advanced-beginner model, SugarScape with Traders, with instructional videos)
+* `Mesa Examples`_ (A repository of seminal ABMs using Mesa and examples of employing specific Mesa Features)
+* `Docs`_ (Mesa's documentation, API and useful snippets)
+* `Discussions`_ (GitHub threaded discussions about Mesa)
+* `Matrix Chat`_ (Chat Forum via Matrix to talk about Mesa)
 
 .. _`Intro to Mesa Tutorial` : http://mesa.readthedocs.org/en/main/tutorials/intro_tutorial.html
+.. _`Complexity Explorer Tutorial` : https://www.complexityexplorer.org/courses/172-agent-based-models-with-python-an-introduction-to-mesa
+.. _`Mesa Examples` : https://github.com/projectmesa/mesa-examples/tree/main/examples
 .. _`Docs` : http://mesa.readthedocs.org/en/main/
-.. _`Email list for users` : https://groups.google.com/d/forum/projectmesa
-.. _`PyPI` : https://pypi.python.org/pypi/Mesa/
+.. _`Discussions` : https://github.com/projectmesa/mesa/discussions
+.. _`Matrix Chat` : https://matrix.to/#/#project-mesa:matrix.org
 
 Running Mesa in Docker
 ------------------------

{Mesa-1.1.1 → Mesa-1.2.0}/README.rst

@@ -13,7 +13,7 @@ Mesa: Agent-based modeling in Python 3+
 .. image:: https://img.shields.io/matrix/project-mesa:matrix.org?label=chat&logo=Matrix
         :target: https://matrix.to/#/#project-mesa:matrix.org
 
-It allows users to quickly create agent-based models using built-in core components (such as spatial grids and agent schedulers) or customized implementations; visualize them using a browser-based interface; and analyze their results using Python's data analysis tools. Its goal is to be the Python 3-based alternative to NetLogo, Repast, or MASON.
+Mesa allows users to quickly create agent-based models using built-in core components (such as spatial grids and agent schedulers) or customized implementations; visualize them using a browser-based interface; and analyze their results using Python's data analysis tools. Its goal is to be the Python 3-based alternative to NetLogo, Repast, or MASON.
 
 
 .. image:: https://raw.githubusercontent.com/projectmesa/mesa/main/docs/images/Mesa_Screenshot.png
@@ -57,19 +57,21 @@ Or any other (development) branch on this repo or your own fork:
 
     $ pip install -U -e git+https://github.com/YOUR_FORK/mesa@YOUR_BRANCH#egg=mesa
 
-Take a look at the `examples <https://github.com/projectmesa/mesa/tree/main/examples>`_ folder for sample models demonstrating Mesa features.
+For resources or help on using Mesa, check out the following:
 
-For more help on using Mesa, check out the following resources:
-
-* `Intro to Mesa Tutorial`_
-* `Docs`_
-* `Email list for users`_
-* `PyPI`_
+* `Intro to Mesa Tutorial`_ (An introductory model, the Boltzmann Wealth Model, for beginners or those new to Mesa.)
+* `Complexity Explorer Tutorial`_ (An advanced-beginner model, SugarScape with Traders, with instructional videos)
+* `Mesa Examples`_ (A repository of seminal ABMs using Mesa and examples of employing specific Mesa Features)
+* `Docs`_ (Mesa's documentation, API and useful snippets)
+* `Discussions`_ (GitHub threaded discussions about Mesa)
+* `Matrix Chat`_ (Chat Forum via Matrix to talk about Mesa)
 
 .. _`Intro to Mesa Tutorial` : http://mesa.readthedocs.org/en/main/tutorials/intro_tutorial.html
+.. _`Complexity Explorer Tutorial` : https://www.complexityexplorer.org/courses/172-agent-based-models-with-python-an-introduction-to-mesa
+.. _`Mesa Examples` : https://github.com/projectmesa/mesa-examples/tree/main/examples
 .. _`Docs` : http://mesa.readthedocs.org/en/main/
-.. _`Email list for users` : https://groups.google.com/d/forum/projectmesa
-.. _`PyPI` : https://pypi.python.org/pypi/Mesa/
+.. _`Discussions` : https://github.com/projectmesa/mesa/discussions
+.. _`Matrix Chat` : https://matrix.to/#/#project-mesa:matrix.org
 
 Running Mesa in Docker
 ------------------------

{Mesa-1.1.1 → Mesa-1.2.0}/mesa/__init__.py

@@ -2,18 +2,16 @@
 Mesa Agent-Based Modeling Framework
 
 Core Objects: Model, and Agent.
-
 """
 import datetime
 
-from mesa.model import Model
-from mesa.agent import Agent
-
-import mesa.time as time
-import mesa.space as space
 import mesa.flat.visualization as visualization
+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
-from mesa.batchrunner import batch_run  # noqa
+from mesa.model import Model
 
 __all__ = [
     "Model",
@@ -26,6 +24,7 @@ __all__ = [
 ]
 
 __title__ = "mesa"
-__version__ = "1.1.1"
+__version__ = "1.2.0"
 __license__ = "Apache 2.0"
-__copyright__ = f"Copyright {datetime.date.today().year} Project Mesa Team"
+_this_year = datetime.datetime.now(tz=datetime.timezone.utc).date().year
+__copyright__ = f"Copyright {_this_year} Project Mesa Team"

{Mesa-1.1.1 → Mesa-1.2.0}/mesa/agent.py

@@ -2,15 +2,15 @@
 The agent class for Mesa framework.
 
 Core Objects: Agent
-
 """
 # Mypy; for the `|` operator purpose
 # Remove this __future__ import once the oldest supported Python is 3.10
 from __future__ import annotations
 
+from random import Random
+
 # mypy
 from typing import TYPE_CHECKING
-from random import Random
 
 if TYPE_CHECKING:
     # We ensure that these are not imported during runtime to prevent cyclic
@@ -35,7 +35,6 @@ class Agent:
 
     def step(self) -> None:
         """A single step of the agent."""
-        pass
 
     def advance(self) -> None:
         pass

{Mesa-1.1.1 → Mesa-1.2.0}/mesa/batchrunner.py

@@ -3,7 +3,6 @@ Batchrunner
 ===========
 
 A single class to manage a batch run or parameter sweep of a given model.
-
 """
 import copy
 import itertools
@@ -11,7 +10,6 @@ import random
 from functools import partial
 from itertools import count, product
 from multiprocessing import Pool, cpu_count
-from warnings import warn
 from typing import (
     Any,
     Dict,
@@ -23,6 +21,7 @@ from typing import (
     Type,
     Union,
 )
+from warnings import warn
 
 import pandas as pd
 from tqdm import tqdm
@@ -284,14 +283,13 @@ class FixedBatchRunner:
                 collected at the level of each agent present in the model at
                 the end of the run.
             display_progress: Display progress bar with time estimation?
-
         """
         self.model_cls = model_cls
         if parameters_list is None:
             parameters_list = []
         self.parameters_list = list(parameters_list)
         self.fixed_parameters = fixed_parameters or {}
-        self._include_fixed = len(self.fixed_parameters.keys()) > 0
+        self._include_fixed = len(self.fixed_parameters) > 0
         self.iterations = iterations
         self.max_steps = max_steps
 
@@ -359,7 +357,7 @@ class FixedBatchRunner:
         model = self.model_cls(**kwargs)
         results = self.run_model(model)
         if param_values is not None:
-            model_key = tuple(param_values) + (run_count,)
+            model_key = (*tuple(param_values), run_count)
         else:
             model_key = (run_count,)
 
@@ -368,7 +366,7 @@ class FixedBatchRunner:
         if self.agent_reporters:
             agent_vars = self.collect_agent_vars(model)
             for agent_id, reports in agent_vars.items():
-                agent_key = model_key + (agent_id,)
+                agent_key = (*model_key, agent_id)
                 self.agent_vars[agent_key] = reports
         # Collects data from datacollector object in model
         if results is not None:
@@ -393,7 +391,6 @@ class FixedBatchRunner:
 
         If your model runs in a non-standard way, this is the method to modify
         in your subclass.
-
         """
         while model.running and model.schedule.steps < self.max_steps:
             model.step()
@@ -405,19 +402,19 @@ class FixedBatchRunner:
 
     def collect_model_vars(self, model):
         """Run reporters and collect model-level variables."""
-        model_vars = {}
-        for var, reporter in self.model_reporters.items():
-            model_vars[var] = reporter(model)
-
+        model_vars = {
+            var: reporter(model) for var, reporter in self.model_reporters.items()
+        }
         return model_vars
 
     def collect_agent_vars(self, model):
         """Run reporters and collect agent-level variables."""
         agent_vars = {}
         for agent in model.schedule._agents.values():
-            agent_record = {}
-            for var, reporter in self.agent_reporters.items():
-                agent_record[var] = getattr(agent, reporter)
+            agent_record = {
+                var: getattr(agent, reporter)
+                for var, reporter in self.agent_reporters.items()
+            }
             agent_vars[agent.unique_id] = agent_record
         return agent_vars
 
@@ -469,12 +466,10 @@ class FixedBatchRunner:
 
         df = pd.DataFrame(records)
         rest_cols = set(df.columns) - set(index_cols)
-        ordered = df[index_cols + list(sorted(rest_cols))]
+        ordered = df[index_cols + sorted(rest_cols)]
         ordered.sort_values(by="Run", inplace=True)
         if self._include_fixed:
-            for param in self.fixed_parameters.keys():
-                val = self.fixed_parameters[param]
-
+            for param, val in self.fixed_parameters.items():
                 # avoid error when val is an iterable
                 vallist = [val for i in range(ordered.shape[0])]
                 ordered[param] = vallist
@@ -537,7 +532,6 @@ class BatchRunner(FixedBatchRunner):
     Note that by default, the reporters only collect data at the *end* of the
     run. To get step by step data, simply have a reporter store the model's
     entire DataCollector object.
-
     """
 
     def __init__(
@@ -580,7 +574,6 @@ class BatchRunner(FixedBatchRunner):
                 collected at the level of each agent present in the model at
                 the end of the run.
             display_progress: Display progress bar with time estimation?
-
         """
         warn(
             "BatchRunner class has been replaced by batch_run function. Please see documentation.",
@@ -720,7 +713,7 @@ class BatchRunnerMP(BatchRunner):  # pragma: no cover
             if self.agent_reporters:
                 agent_vars = self.collect_agent_vars(model)
                 for agent_id, reports in agent_vars.items():
-                    agent_key = model_key + (agent_id,)
+                    agent_key = (*model_key, agent_id)
                     self.agent_vars[agent_key] = reports
             if hasattr(model, "datacollector"):
                 if model.datacollector.model_reporters is not None:
@@ -733,9 +726,9 @@ class BatchRunnerMP(BatchRunner):  # pragma: no cover
                     ] = model.datacollector.get_agent_vars_dataframe()
 
         # Make results consistent
-        if len(self.datacollector_model_reporters.keys()) == 0:
+        if len(self.datacollector_model_reporters) == 0:
             self.datacollector_model_reporters = None
-        if len(self.datacollector_agent_reporters.keys()) == 0:
+        if len(self.datacollector_agent_reporters) == 0:
             self.datacollector_agent_reporters = None
 
     def run_all(self):

{Mesa-1.1.1 → Mesa-1.2.0}/mesa/datacollection.py

@@ -33,13 +33,13 @@ The default DataCollector here makes several assumptions:
     * The model has a schedule object called 'schedule'
     * The schedule has an agent list called agents
     * For collecting agent-level variables, agents must have a unique_id
-
 """
-from functools import partial
 import itertools
+import types
+from functools import partial
 from operator import attrgetter
+
 import pandas as pd
-import types
 
 
 class DataCollector:
@@ -50,11 +50,8 @@ class DataCollector:
     functions which actually collect them. When the collect(...) method is
     called, it collects these attributes and executes these functions one by
     one and stores the results.
-
     """
 
-    model = None
-
     def __init__(self, model_reporters=None, agent_reporters=None, tables=None):
         """Instantiate a DataCollector with lists of model and agent reporters.
         Both model_reporters and agent_reporters accept a dictionary mapping a
@@ -87,13 +84,13 @@ class DataCollector:
             Model reporters can take four types of arguments:
             lambda like above:
             {"agent_count": lambda m: m.schedule.get_agent_count() }
-            method with @property decorators
-            {"agent_count": schedule.get_agent_count()
-            class attributes of model
+            method of a class/instance:
+            {"agent_count": self.get_agent_count} # self here is a class instance
+            {"agent_count": Model.get_agent_count} # Model here is a class
+            class attributes of a model
             {"model_attribute": "model_attribute"}
             functions with parameters that have placed in a list
             {"Model_Function":[function, [param_1, param_2]]}
-
         """
         self.model_reporters = {}
         self.agent_reporters = {}
@@ -122,8 +119,6 @@ class DataCollector:
             reporter: Attribute string, or function object that returns the
                       variable when given a model instance.
         """
-        if type(reporter) is str:
-            reporter = partial(self._getattr, reporter)
         self.model_reporters[name] = reporter
         self.model_vars[name] = []
 
@@ -134,7 +129,6 @@ class DataCollector:
             name: Name of the agent-level variable to collect.
             reporter: Attribute string, or function object that returns the
                       variable when given a model instance.
-
         """
         if type(reporter) is str:
             attribute_name = reporter
@@ -148,7 +142,6 @@ class DataCollector:
         Args:
             table_name: Name of the new table.
             table_columns: List of columns to add to the table.
-
         """
         new_table = {column: [] for column in table_columns}
         self.tables[table_name] = new_table
@@ -156,7 +149,7 @@ class DataCollector:
     def _record_agents(self, model):
         """Record agents data in a mapping of functions and agents."""
         rep_funcs = self.agent_reporters.values()
-        if all([hasattr(rep, "attribute_name") for rep in rep_funcs]):
+        if all(hasattr(rep, "attribute_name") for rep in rep_funcs):
             prefix = ["model.schedule.steps", "unique_id"]
             attributes = [func.attribute_name for func in rep_funcs]
             get_reports = attrgetter(*prefix + attributes)
@@ -170,25 +163,23 @@ class DataCollector:
         agent_records = map(get_reports, model.schedule.agents)
         return agent_records
 
-    def _reporter_decorator(self, reporter):
-        return reporter()
-
     def collect(self, model):
         """Collect all the data for the given model object."""
         if self.model_reporters:
-
             for var, reporter in self.model_reporters.items():
                 # Check if Lambda operator
                 if isinstance(reporter, types.LambdaType):
                     self.model_vars[var].append(reporter(model))
                 # Check if model attribute
-                elif isinstance(reporter, partial):
-                    self.model_vars[var].append(reporter(model))
+                elif isinstance(reporter, str):
+                    self.model_vars[var].append(getattr(model, reporter, None))
                 # Check if function with arguments
                 elif isinstance(reporter, list):
                     self.model_vars[var].append(reporter[0](*reporter[1]))
+                # TODO: Check if method of a class, as of now it is assumed
+                # implicitly if the other checks fail.
                 else:
-                    self.model_vars[var].append(self._reporter_decorator(reporter))
+                    self.model_vars[var].append(reporter())
 
         if self.agent_reporters:
             agent_records = self._record_agents(model)
@@ -202,7 +193,6 @@ class DataCollector:
             row: A dictionary of the form {column_name: value...}
             ignore_missing: If True, fill any missing columns with Nones;
                             if False, throw an error if any columns are missing
-
         """
         if table_name not in self.tables:
             raise Exception("Table does not exist.")
@@ -225,7 +215,6 @@ class DataCollector:
 
         The DataFrame has one column for each model variable, and the index is
         (implicitly) the model tick.
-
         """
         return pd.DataFrame(self.model_vars)
 
@@ -234,16 +223,15 @@ class DataCollector:
 
         The DataFrame has one column for each variable, with two additional
         columns for tick and agent_id.
-
         """
         all_records = itertools.chain.from_iterable(self._agent_records.values())
         rep_names = list(self.agent_reporters)
 
         df = pd.DataFrame.from_records(
             data=all_records,
-            columns=["Step", "AgentID"] + rep_names,
+            columns=["Step", "AgentID", *rep_names],
+            index=["Step", "AgentID"],
         )
-        df = df.set_index(["Step", "AgentID"])
         return df
 
     def get_table_dataframe(self, table_name):
@@ -251,7 +239,6 @@ class DataCollector:
 
         Args:
             table_name: The name of the table to convert.
-
         """
         if table_name not in self.tables:
             raise Exception("No such table.")

{Mesa-1.1.1 → Mesa-1.2.0}/mesa/main.py

@@ -1,8 +1,9 @@
-import sys
 import os
-import click
+import sys
 from subprocess import call
 
+import click
+
 PROJECT_PATH = click.Path(
     exists=True, file_okay=False, dir_okay=True, resolve_path=True
 )
@@ -14,7 +15,6 @@ COOKIECUTTER_PATH = os.path.join(os.path.dirname(SCRIPTS_DIR), COOKIECUTTER_DIR)
 @click.group()
 def cli():
     "Manage Mesa projects"
-    pass
 
 
 @cli.command()
@@ -30,7 +30,7 @@ def runserver(project):
 
     with open("run.py") as f:
         code = compile(f.read(), "run.py", "exec")
-        exec(code, {}, {})
+        exec(code, {}, {})  # noqa: S102
 
 
 @click.command()