Merge branch 'main' into main

Author: tpike3

.pre-commit-config.yaml

@@ -4,23 +4,31 @@ ci:
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.8.6
+  rev: v0.9.9
   hooks:
     # Run the linter.
-    # TODO fix the lint issues for the Jupyter notebooks
     - id: ruff
-      types_or: [ python, pyi ]
+      types_or: [ python, pyi, jupyter ]
+      args: [--fix]
     # Run the formatter.
     - id: ruff-format
       types_or: [ python, pyi, jupyter ]
 -   repo: https://github.com/asottile/pyupgrade
     rev: v3.19.1
     hooks:
     -   id: pyupgrade
-        args: [--py38-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:
     -   id: trailing-whitespace
     -   id: check-toml
     -   id: check-yaml
+- repo: https://github.com/codespell-project/codespell
+  rev: v2.4.1
+  hooks:
+    - id: codespell
+      args: [
+        "--ignore-words",
+        ".codespellignore",
+      ]

examples/warehouse/model.py

@@ -1,14 +1,15 @@
 import mesa
-from agents import (
+from make_warehouse import make_warehouse
+from mesa.discrete_space import OrthogonalMooreGrid
+from mesa.discrete_space.cell_agent import CellAgent
+from mesa.experimental.meta_agents.meta_agent import create_meta_agent
+
+from .agents import (
     InventoryAgent,
     RouteAgent,
     SensorAgent,
     WorkerAgent,
 )
-from make_warehouse import make_warehouse
-from mesa.discrete_space import OrthogonalMooreGrid
-from mesa.discrete_space.cell_agent import CellAgent
-from mesa.experimental.meta_agents.meta_agent import create_meta_agent
 
 # Constants for configuration
 LOADING_DOCKS = [(0, 0, 0), (0, 2, 0), (0, 4, 0), (0, 6, 0), (0, 8, 0)]