Skip to content

refactor(dfn): rename _SCALAR_TYPES to public SCALAR_TYPES #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wpbonelli merged 2 commits into from
Sep 11, 2025
Merged

refactor(dfn): rename _SCALAR_TYPES to public SCALAR_TYPES #236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a4508d
refactor(dfn): rename _SCALAR_TYPES to public SCALAR_TYPES
mwtoews Sep 11, 2025
22aa6a6
Fix lint (RUF059)
mwtoews Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions modflow_devtools/dfn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ def block_sort_key(item) -> int:
]


_SCALAR_TYPES = ("keyword", "integer", "double precision", "string")
SCALAR_TYPES = ("keyword", "integer", "double precision", "string")
_SCALAR_TYPES = SCALAR_TYPES # allow backwards compat; imported by flopy


Dfns = dict[str, "Dfn"]
Expand All @@ -130,7 +131,7 @@ def get_blocks(dfn: "Dfn") -> Blocks:
"""

def _is_block(item: tuple[str, Any]) -> bool:
k, v = item
k, _v = item
return k not in Dfn.__annotations__

return dict(
Expand Down Expand Up @@ -455,7 +456,7 @@ def _item() -> Field:
return _convert_field(next(iter(flat.getlist(item_names[0]))))

# implicit simple record (no children)
if all(t in _SCALAR_TYPES for t in item_types):
if all(t in SCALAR_TYPES for t in item_types):
return Field(
name=_name,
type="record",
Expand Down Expand Up @@ -543,7 +544,7 @@ def _fields() -> Fields:
# for now, we can tell a var is an array if its type
# is scalar and it has a shape. once we have proper
# typing, this can be read off the type itself.
elif shape is not None and _type not in _SCALAR_TYPES:
elif shape is not None and _type not in SCALAR_TYPES:
raise TypeError(f"Unsupported array type: {_type}")

else:
Expand Down