diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ef8a7a7e..23dfaea9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ ci: repos: - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.15.20 + rev: v0.16.1 hooks: # Run the linter. - id: ruff @@ -25,7 +25,7 @@ repos: - id: check-toml - id: check-yaml - repo: https://github.com/codespell-project/codespell - rev: v2.4.2 + rev: v2.4.3 hooks: - id: codespell args: [ @@ -33,7 +33,7 @@ repos: ".codespellignore", ] - repo: https://github.com/DavidAnson/markdownlint-cli2 # For formatting markdown for documentation - rev: v0.23.0 + rev: v0.23.2 hooks: - id: markdownlint-cli2 args: [ diff --git a/docs/general/tutorials/3_advanced_tutorial.py b/docs/general/tutorials/3_advanced_tutorial.py index caa5c0a0..a0ecfbbe 100644 --- a/docs/general/tutorials/3_advanced_tutorial.py +++ b/docs/general/tutorials/3_advanced_tutorial.py @@ -388,12 +388,12 @@ def __init__( self.datacollector = DataCollector( model=self, model_reporters={ - "mean_sugar": lambda m: 0.0 - if len(m.sets[0]) == 0 - else float(m.sets[0].df["sugar"].mean()), - "total_sugar": lambda m: float(m.sets[0].df["sugar"].sum()) - if len(m.sets[0]) - else 0.0, + "mean_sugar": lambda m: ( + 0.0 if len(m.sets[0]) == 0 else float(m.sets[0].df["sugar"].mean()) + ), + "total_sugar": lambda m: ( + float(m.sets[0].df["sugar"].sum()) if len(m.sets[0]) else 0.0 + ), "agents_alive": lambda m: float(len(m.sets[0])) if len(m.sets) else 0.0, "gini": gini, "corr_sugar_metabolism": corr_sugar_metabolism, diff --git a/docs/general/tutorials/4_datacollector.py b/docs/general/tutorials/4_datacollector.py index 2522806c..6b6e698d 100644 --- a/docs/general/tutorials/4_datacollector.py +++ b/docs/general/tutorials/4_datacollector.py @@ -56,8 +56,9 @@ def __init__(self, n: int): }, storage="memory", # we'll switch this per example storage_uri=None, - trigger=lambda m: m.steps % 2 - == 0, # collect every 2 steps via conditional_collect + trigger=lambda m: ( + m.steps % 2 == 0 + ), # collect every 2 steps via conditional_collect reset_memory=True, ) diff --git a/examples/sugarscape_ig/backend_frames/model.py b/examples/sugarscape_ig/backend_frames/model.py index c51122fe..74fae81c 100644 --- a/examples/sugarscape_ig/backend_frames/model.py +++ b/examples/sugarscape_ig/backend_frames/model.py @@ -254,12 +254,12 @@ def __init__( self.datacollector = DataCollector( model=self, model_reporters={ - "mean_sugar": lambda m: 0.0 - if len(m.sets[0]) == 0 - else float(m.sets[0].df["sugar"].mean()), - "total_sugar": lambda m: float(m.sets[0].df["sugar"].sum()) - if len(m.sets[0]) - else 0.0, + "mean_sugar": lambda m: ( + 0.0 if len(m.sets[0]) == 0 else float(m.sets[0].df["sugar"].mean()) + ), + "total_sugar": lambda m: ( + float(m.sets[0].df["sugar"].sum()) if len(m.sets[0]) else 0.0 + ), "agents_alive": lambda m: float(len(m.sets[0])) if len(m.sets) else 0.0, "gini": gini, "corr_sugar_metabolism": corr_sugar_metabolism, diff --git a/examples/sugarscape_ig/backend_mesa/model.py b/examples/sugarscape_ig/backend_mesa/model.py index 5b7bbf90..c6d758f1 100644 --- a/examples/sugarscape_ig/backend_mesa/model.py +++ b/examples/sugarscape_ig/backend_mesa/model.py @@ -120,12 +120,14 @@ def __init__( # are comparable across backends. self.datacollector = DataCollector( model_reporters={ - "mean_sugar": lambda m: float(np.mean([a.sugar for a in m.agent_list])) - if m.agent_list - else 0.0, - "total_sugar": lambda m: float(sum(a.sugar for a in m.agent_list)) - if m.agent_list - else 0.0, + "mean_sugar": lambda m: ( + float(np.mean([a.sugar for a in m.agent_list])) + if m.agent_list + else 0.0 + ), + "total_sugar": lambda m: ( + float(sum(a.sugar for a in m.agent_list)) if m.agent_list else 0.0 + ), "agents_alive": lambda m: float(len(m.agent_list)), "gini": lambda m: gini(a.sugar for a in m.agent_list), "corr_sugar_metabolism": lambda m: corr_sugar_metabolism(m),