Merge remote-tracking branch 'origin/main' into julia-codegen

Author: finsberg

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.8.1'
+    rev: 'v0.9.2'
     hooks:
        # Run the linter.
       - id: ruff
@@ -23,15 +23,15 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.13.0
+    rev: v1.14.1
     hooks:
       - id: mypy
         additional_dependencies: ["types-attrs"]
         files: ^src/|^tests/
         args: ["--config-file", "pyproject.toml"]
 
   - repo: https://github.com/streetsidesoftware/cspell-cli
-    rev: v8.16.0
+    rev: v8.17.1
     hooks:
       - id: cspell
         files: src/|docs/(.+).md|tests|README.md|examples/(.+).py

src/gotranx/cli/gotran2c.py

@@ -59,7 +59,7 @@ def get_code(
         codegen.imports(),
         f"int NUM_STATES = {len(ode.states)};",
         f"int NUM_PARAMS = {len(ode.parameters)};",
-        f"int NUM_MONITORED = { len(ode.state_derivatives) + len(ode.intermediates)};",
+        f"int NUM_MONITORED = {len(ode.state_derivatives) + len(ode.intermediates)};",
         codegen.parameter_index(),
         codegen.state_index(),
         codegen.monitor_index(),

src/gotranx/exceptions.py

@@ -34,10 +34,7 @@ class StateNotFoundInComponent(GotranxError):
     component_name: str
 
     def __str__(self) -> str:
-        return (
-            f"State with name {self.state_name!r} "
-            f"not found in component {self.component_name!r}"
-        )
+        return f"State with name {self.state_name!r} not found in component {self.component_name!r}"
 
 
 @dataclass

src/gotranx/sympytools.py

@@ -91,7 +91,7 @@ def Conditional(cond, true_value, false_value):
 
     if not isinstance(cond, (Relational, Boolean)):
         raise TypeError(
-            "Cond %s is of type %s, but must be a Relational" " or Boolean." % (cond, type(cond)),
+            "Cond %s is of type %s, but must be a Relational or Boolean." % (cond, type(cond)),
         )
 
     return sympy.functions.Piecewise(
@@ -124,7 +124,7 @@ def ContinuousConditional(cond, true_value, false_value, sigma=1.0):
     # FIXME: in latest sympy making comparison difficult
     if "<" not in cond.rel_op and ">" not in cond.rel_op:
         TypeError(
-            "Expected a lesser or greater than relational for " "a continuous conditional .",
+            "Expected a lesser or greater than relational for a continuous conditional .",
         )
 
     # Create Heaviside

tests/test_ode_component.py

@@ -86,7 +86,7 @@ def test_component_with_multiple_component_names(
 
 def test_component_intermediates(parser, trans):
     tree = parser.parse(
-        ("parameters(x=1, y=2)\n" "states(a=2, b=3)\n" "da_dt=0\n" "c=a+b\n" "db_dt=c - a"),
+        ("parameters(x=1, y=2)\nstates(a=2, b=3)\nda_dt=0\nc=a+b\ndb_dt=c - a"),
     )
     result = trans.transform(tree)
     comp = result.components[0]