modflow-devtools 1.5.0__tar.gz → 1.6.0__tar.gz

{modflow_devtools-1.5.0/modflow_devtools.egg-info → modflow_devtools-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modflow-devtools
-Version: 1.5.0
+Version: 1.6.0
 Summary: Python tools for MODFLOW development
 Author-email: "Joseph D. Hughes" <modflow@usgs.gov>, Michael Reno <mreno@ucar.edu>, Mike Taves <mwtoews@gmail.com>, Wes Bonelli <wbonelli@ucar.edu>
 Maintainer-email: "Joseph D. Hughes" <modflow@usgs.gov>

{modflow_devtools-1.5.0 → modflow_devtools-1.6.0}/modflow_devtools/__init__.py

@@ -1,6 +1,6 @@
 __author__ = "Joseph D. Hughes"
-__date__ = "May 15, 2024"
-__version__ = "1.5.0"
+__date__ = "May 30, 2024"
+__version__ = "1.6.0"
 __maintainer__ = "Joseph D. Hughes"
 __email__ = "jdhughes@usgs.gov"
 __status__ = "Production"

{modflow_devtools-1.5.0 → modflow_devtools-1.6.0}/modflow_devtools/misc.py

@@ -284,13 +284,41 @@ def get_model_paths(
     Find model directories recursively in the given location.
     A model directory is any directory containing one or more
     namefiles. Model directories can be filtered or excluded,
-    by prefix, pattern, namefile name, or packages used.
-    """
-
-    namefile_paths = get_namefile_paths(
-        path, prefix, namefile, excluded, selected, packages
-    )
-    model_paths = sorted(list(set([p.parent for p in namefile_paths if p.parent.name])))
+    by prefix, pattern, namefile name, or packages used. The
+    directories are returned in order within scenario folders
+    such that groundwater flow model workspaces precede other
+    model types. This allows models which depend on the flow
+    model's outputs to consume its head or budget, and models
+    should successfully run in the sequence returned provided
+    input files (e.g. FMI) refer to output via relative paths.
+    """
+
+    def keyfunc(v):
+        v = str(v)
+        if "gwf" in v:
+            return 0
+        else:
+            return 1
+
+    model_paths = []
+    globbed = path.rglob(f"{prefix if prefix else ''}*")
+    example_paths = [p for p in globbed if p.is_dir()]
+    for p in example_paths:
+        for mp in sorted(
+            list(
+                set(
+                    [
+                        p.parent
+                        for p in get_namefile_paths(
+                            p, prefix, namefile, excluded, selected, packages
+                        )
+                    ]
+                )
+            ),
+            key=keyfunc,
+        ):
+            if mp not in model_paths:
+                model_paths.append(mp)
     return model_paths
 
 

{modflow_devtools-1.5.0 → modflow_devtools-1.6.0}/modflow_devtools/snapshots.py

@@ -8,10 +8,13 @@ pytest = import_optional_dependency("pytest")
 syrupy = import_optional_dependency("syrupy")
 
 # ruff: noqa: E402
+from syrupy import __import_extension
+from syrupy.assertion import SnapshotAssertion
 from syrupy.extensions.single_file import (
     SingleFileSnapshotExtension,
     WriteMode,
 )
+from syrupy.location import PyTestLocation
 from syrupy.types import (
     PropertyFilter,
     PropertyMatcher,
@@ -90,19 +93,67 @@ class ReadableArrayExtension(SingleFileSnapshotExtension):
         return np.array2string(data, threshold=np.inf)
 
 
+class MatchAnything:
+    def __eq__(self, _):
+        return True
+
+
 # fixtures
 
 
+@pytest.fixture(scope="session")
+def snapshot_disable(pytestconfig) -> bool:
+    return pytestconfig.getoption("--snapshot-disable")
+
+
 @pytest.fixture
-def array_snapshot(snapshot):
-    return snapshot.use_extension(BinaryArrayExtension)
+def snapshot(request, snapshot_disable) -> "SnapshotAssertion":
+    return (
+        MatchAnything()
+        if snapshot_disable
+        else SnapshotAssertion(
+            update_snapshots=request.config.option.update_snapshots,
+            extension_class=__import_extension(request.config.option.default_extension),
+            test_location=PyTestLocation(request.node),
+            session=request.session.config._syrupy,
+        )
+    )
 
 
 @pytest.fixture
-def text_array_snapshot(snapshot):
-    return snapshot.use_extension(TextArrayExtension)
+def array_snapshot(snapshot, snapshot_disable):
+    return (
+        MatchAnything()
+        if snapshot_disable
+        else snapshot.use_extension(BinaryArrayExtension)
+    )
 
 
 @pytest.fixture
-def readable_array_snapshot(snapshot):
-    return snapshot.use_extension(ReadableArrayExtension)
+def text_array_snapshot(snapshot, snapshot_disable):
+    return (
+        MatchAnything()
+        if snapshot_disable
+        else snapshot.use_extension(TextArrayExtension)
+    )
+
+
+@pytest.fixture
+def readable_array_snapshot(snapshot, snapshot_disable):
+    return (
+        MatchAnything()
+        if snapshot_disable
+        else snapshot.use_extension(ReadableArrayExtension)
+    )
+
+
+# pytest config hooks
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--snapshot-disable",
+        action="store_true",
+        default=False,
+        help="Disable snapshot comparisons.",
+    )

{modflow_devtools-1.5.0 → modflow_devtools-1.6.0/modflow_devtools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modflow-devtools
-Version: 1.5.0
+Version: 1.6.0
 Summary: Python tools for MODFLOW development
 Author-email: "Joseph D. Hughes" <modflow@usgs.gov>, Michael Reno <mreno@ucar.edu>, Mike Taves <mwtoews@gmail.com>, Wes Bonelli <wbonelli@ucar.edu>
 Maintainer-email: "Joseph D. Hughes" <modflow@usgs.gov>

modflow_devtools-1.6.0/version.txt

@@ -0,0 +1 @@
+1.6.0

modflow_devtools-1.5.0/version.txt

@@ -1 +0,0 @@
-1.5.0