Upgrade syntax

Author: finsberg

src/gotranx/atoms.py

@@ -126,7 +126,7 @@ class State(Atom):
 
     value: float | sp.core.Number = attr.ib()
 
-    def to_TimeDependentState(self, t: sp.Symbol) -> "TimeDependentState":
+    def to_TimeDependentState(self, t: sp.Symbol) -> TimeDependentState:
         return TimeDependentState(
             name=self.name,
             value=self.value,
@@ -288,7 +288,7 @@ def singularities(self, lookup: dict[str, Atom]) -> frozenset[Singularity]:
                 )
         return frozenset(singularity_list)
 
-    def remove_singularities(self, lookup: dict[str, Atom]) -> "Assignment":
+    def remove_singularities(self, lookup: dict[str, Atom]) -> Assignment:
         """Remove singularities from the assignment
 
         Parameters
@@ -354,7 +354,7 @@ def resolve_expression(self, symbols: dict[str, sp.Symbol]) -> Assignment:
             comment=self.comment,
         )
 
-    def to_intermediate(self) -> "Intermediate":
+    def to_intermediate(self) -> Intermediate:
         """Convert the Assignment to an Intermediate"""
         return Intermediate(
             name=self.name,
@@ -368,7 +368,7 @@ def to_intermediate(self) -> "Intermediate":
             comment=self.comment,
         )
 
-    def to_state_derivative(self, state: State) -> "StateDerivative":
+    def to_state_derivative(self, state: State) -> StateDerivative:
         """Convert the Assignment to a StateDerivative
 
         Parameters
@@ -389,7 +389,7 @@ def to_state_derivative(self, state: State) -> "StateDerivative":
             comment=self.comment,
         )
 
-    def simplify(self) -> "Assignment":
+    def simplify(self) -> Assignment:
         """Simplify the expression of the assignment using sympy's
         simplify function. This function returns a new Assignment
         object with the simplified expression.

src/gotranx/cli/__init__.py

@@ -2,10 +2,6 @@
 from pathlib import Path
 import warnings
 
-try:
-    from typing import Annotated
-except ImportError:
-    from typing_extensions import Annotated  # type: ignore
 
 import typer
 
@@ -106,11 +102,11 @@ def convert(
         "-v",
         help="Verbose output",
     ),
-    scheme: Annotated[
+    scheme: typing.Annotated[
         typing.Optional[typing.List[Scheme]],
         typer.Option(help="Numerical scheme for solving the ODE"),
     ] = None,
-    stiff_states: Annotated[
+    stiff_states: typing.Annotated[
         typing.Optional[typing.List[str]],
         typer.Option("-s", "--stiff-states", help="Stiff states for the hybrid rush larsen scheme"),
     ] = None,
@@ -266,11 +262,11 @@ def ode2py(
         "-v",
         help="Verbose output",
     ),
-    scheme: Annotated[
+    scheme: typing.Annotated[
         typing.List[Scheme],
         typer.Option(help="Numerical scheme for solving the ODE"),
     ] = [],
-    stiff_states: Annotated[
+    stiff_states: typing.Annotated[
         typing.List[str],
         typer.Option("-s", "--stiff-states", help="Stiff states for the hybrid rush larsen scheme"),
     ] = [],
@@ -370,11 +366,11 @@ def ode2c(
         "-v",
         help="Verbose output",
     ),
-    scheme: Annotated[
+    scheme: typing.Annotated[
         typing.List[Scheme],
         typer.Option(help="Numerical scheme for solving the ODE"),
     ] = [],
-    stiff_states: Annotated[
+    stiff_states: typing.Annotated[
         typing.List[str],
         typer.Option("-s", "--stiff-states", help="Stiff states for the hybrid rush larsen scheme"),
     ] = [],

src/gotranx/ode.py

@@ -4,8 +4,8 @@
 from functools import cached_property
 from pathlib import Path
 from graphlib import TopologicalSorter
-from typing import Iterable
-from typing import Sequence
+from collections.abc import Iterable
+from collections.abc import Sequence
 from typing import TypeVar
 from typing import cast
 from typing import Any

src/gotranx/parser.py

@@ -14,9 +14,8 @@ def load_grammar() -> str:
     str
         The grammar
     """
-    with open(_here / "ode.lark", "r") as f:
-        text = f.read()
-    return text
+
+    return (_here / "ode.lark").read_text()
 
 
 class Parser(Lark):

src/gotranx/transformer.py

@@ -2,7 +2,6 @@
 
 from collections import defaultdict
 from typing import NamedTuple
-from typing import Type
 from typing import TypeVar
 
 import lark
@@ -144,15 +143,15 @@ def find_components(
 
 def lark_list_to_parameters(
     s: list[None | lark.tree.Tree | lark.lexer.Token],
-    cls: Type[T],
+    cls: type[T],
 ) -> tuple[T, ...]:
     """Convert a list of lark trees to parameters
 
     Parameters
     ----------
     s : list[None  |  lark.tree.Tree  |  lark.lexer.Token]
         The list
-    cls : Type[T]
+    cls : type[T]
         The class of the parameters
 
     Returns
@@ -173,7 +172,7 @@ def lark_list_to_parameters(
 def tree2parameter(
     s: lark.Tree,
     components: tuple[str, ...],
-    cls: Type[T],
+    cls: type[T],
 ) -> T:
     """Convert a lark tree to a parameter
 
@@ -183,7 +182,7 @@ def tree2parameter(
         The tree
     components : tuple[str, ...]
         The components
-    cls : Type[T]
+    cls : type[T]
         The class of the parameter
 
     Returns