parametrize test

Author: wpbonelli

autotest/test_codec.py

@@ -1,15 +1,16 @@
+import pytest
+
+import modflow_devtools.models as models
 from modflow_devtools.codec import make_parser
 
+MODELS = [name for name in models.get_models().keys() if name.startswith("mf6/")]
+
 
-def test_parser():
+@pytest.mark.parametrize("model_name", MODELS)
+def test_parser(model_name, function_tmpdir):
+    workspace = models.copy_to(function_tmpdir, model_name)
+    nam_path = next(iter(workspace.glob("*.nam")))
+    text = nam_path.open().read()
     parser = make_parser()
-    text = """
-BEGIN OPTIONS
-    AN OPTION
-    ANOTHER OPTION
-END OPTIONS
-BEGIN PACKAGEDATA
-END PACKAGEDATA
-"""
     tree = parser.parse(text)
     print(tree.pretty())

modflow_devtools/dfn.py

@@ -164,9 +164,9 @@ class Dfn(TypedDict):
     name: str
     advanced: bool
     multi: bool
-    ref: Optional[Ref]
-    sln: Optional[Sln]
-    fkeys: Optional[Dfns]
+    ref: Ref | None
+    sln: Sln | None
+    fkeys: Dfns | None
 
     @staticmethod
     def _load_v1_flat(f, common: dict | None = None) -> tuple[Mapping, list[str]]:

modflow_devtools/mf6.lark

@@ -1,15 +1,15 @@
 start: [WS] block+ [WS]
-
 block: "begin"i CNAME _NL _content "end"i CNAME _NL
 _content: line* [WS]
 line: [WS] value* _NL
 value: WORD | NUMBER
 
-
 %import common.NEWLINE -> _NL
 %import common.WS
 %import common.WS_INLINE
 %import common.CNAME
 %import common.WORD
 %import common.NUMBER
-%ignore WS_INLINE
+%import common.SH_COMMENT
+%ignore WS_INLINE
+%ignore SH_COMMENT