Merge pull request #306 from MODFLOW-ORG/v1.9.2

Release 1.9.2

Author: wpbonelli

HISTORY.md

@@ -1,3 +1,10 @@
+### Version 1.9.2
+
+#### Bug fixes
+
+* [fix(dfns)](https://github.com/MODFLOW-ORG/modflow-devtools/commit/4e8ff9993045b7a4a291f50fb2167d79fce1bd46): Add tagged attribute to field schema (#304). Committed by wpbonelli on 2026-03-09.
+* [fix(dfns)](https://github.com/MODFLOW-ORG/modflow-devtools/commit/5ff8d7f17ecbc8ee0c8ddc16b020f7f992b6e69b): Remove fkeys/ref; add DfnSpec.dump/s() (#305). Committed by wpbonelli on 2026-04-20.
+
 ### Version 1.9.1
 
 #### Bug fixes

autotest/test_dfns.py

@@ -422,7 +422,7 @@ def test_fieldv1_to_fieldv2_conversion():
     assert save_flows.type == "keyword"
     assert save_flows.block == "options"
     assert save_flows.description == "save calculated flows"
-    assert not hasattr(save_flows, "tagged")
+    assert hasattr(save_flows, "tagged")
     assert not hasattr(save_flows, "in_record")
     assert not hasattr(save_flows, "reader")
 

docs/conf.py

@@ -8,7 +8,7 @@
 
 project = "modflow-devtools"
 author = "MODFLOW Team"
-release = "1.9.1"
+release = "1.9.2"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

modflow_devtools/__init__.py

@@ -1,6 +1,6 @@
 __author__ = "Joseph D. Hughes"
-__date__ = "Mar 05, 2026"
-__version__ = "1.9.1"
+__date__ = "Apr 20, 2026"
+__version__ = "1.9.2"
 __maintainer__ = "Joseph D. Hughes"
 __email__ = "jdhughes@usgs.gov"
 __status__ = "Production"

modflow_devtools/dfns/__init__.py

@@ -29,7 +29,6 @@
 )
 from modflow_devtools.dfns.schema.block import Block, Blocks, block_sort_key
 from modflow_devtools.dfns.schema.field import Field, Fields
-from modflow_devtools.dfns.schema.ref import Ref
 from modflow_devtools.dfns.schema.v1 import SCALAR_TYPES as V1_SCALAR_TYPES
 from modflow_devtools.dfns.schema.v1 import FieldV1
 from modflow_devtools.dfns.schema.v2 import FieldV2
@@ -61,7 +60,6 @@
     "FieldV2",
     "Fields",
     "LocalDfnRegistry",
-    "Ref",
     "RemoteDfnRegistry",
     "block_sort_key",
     "get_dfn",
@@ -106,9 +104,6 @@ class Dfn:
         Whether this is a multi-package.
     ftype : str | None
         File type identifier.
-    ref : Ref | None
-        Metadata if this component is a subpackage (child's perspective).
-        Populated from DFN comments like: # flopy subpackage <key> <abbr> <param> <val>
     blocks : Blocks | None
         Block definitions containing field specifications.
     children : Dfns | None
@@ -125,7 +120,6 @@ class Dfn:
     advanced: bool = False
     multi: bool = False
     ftype: str | None = None
-    ref: Ref | None = None
     blocks: Blocks | None = None
     children: Dfns | None = None
     subcomponents: list[str] | None = None
@@ -258,6 +252,23 @@ def __contains__(self, name: object) -> bool:
         """Check if a component exists by name."""
         return name in self._flat
 
+    def dump(self, f) -> None:
+        """Serialize the full spec to a TOML byte stream."""
+        import tomli_w
+
+        doc = {"schema_version": str(self.schema_version)}
+        for name, dfn in self._flat.items():
+            doc[name] = _toml_safe(remap(asdict(dfn), visit=drop_none_or_empty))
+        f.write(tomli_w.dumps(doc).encode())
+
+    def dumps(self) -> str:
+        """Serialize the full spec to a TOML string."""
+        import io
+
+        buf = io.BytesIO()
+        self.dump(buf)
+        return buf.getvalue().decode()
+
     @classmethod
     def load(
         cls,
@@ -563,13 +574,23 @@ def map(self, dfn: Dfn) -> Dfn:
             advanced=dfn.advanced,
             multi=dfn.multi,
             ftype=dfn.ftype or (dfn.name.split("-", 1)[1].upper() if "-" in dfn.name else None),
-            ref=dfn.ref,
             blocks=MapV1To2.map_blocks(dfn),
             schema_version=v2,
             parent=dfn.parent,
         )
 
 
+def _toml_safe(obj):
+    """Recursively coerce non-TOML-native types to str."""
+    if isinstance(obj, dict):
+        return {k: _toml_safe(v) for k, v in obj.items()}
+    if isinstance(obj, list):
+        return [_toml_safe(v) for v in obj]
+    if isinstance(obj, (str, int, float, bool)) or obj is None:
+        return obj
+    return str(obj)
+
+
 def map(
     dfn: Dfn,
     schema_version: str | Version = "2",
@@ -618,7 +639,6 @@ def load(f, format: str = "dfn", **kwargs) -> Dfn:
             "multi": data.pop("multi", False),
             "ftype": data.pop("ftype", None)
             or (dfn_name.split("-", 1)[1].upper() if dfn_name and "-" in dfn_name else None),
-            "ref": data.pop("ref", None),
         }
 
         if (expected_name := kwargs.pop("name", None)) is not None:

modflow_devtools/dfns/parse.py

@@ -101,17 +101,16 @@ def parse_mf6_subpackages(meta: list[str]) -> list[str]:
     Returns
     -------
     list[str]
-        List of uppercase component abbreviations (e.g., ['UTL-NCF']).
+        List of lowercase component abbreviations (e.g., ['utl-ncf']).
 
     See Also
     --------
     Dfn.subcomponents : Stores the result (schema-level constraint).
-    Dfn.fkeys : Field-level foreign keys from flopy subpackage declarations.
     """
     result = []
     for m in meta:
         if m.startswith("mf6-subpackage "):
-            abbr = m.removeprefix("mf6-subpackage ").strip().upper()
+            abbr = m.removeprefix("mf6-subpackage ").strip().lower()
             result.append(abbr)
     return result
 

modflow_devtools/dfns/schema/field.py

@@ -19,3 +19,4 @@ class Field:
     shape: str | None = None
     valid: tuple[str, ...] | None = None
     netcdf: bool = False
+    tagged: bool = False

modflow_devtools/dfns/schema/ref.py

@@ -1 +1 @@
-1.9.1
+1.9.2