testing

Author: wpbonelli

.github/workflows/ci.yml

@@ -107,8 +107,8 @@ jobs:
           REPOS_PATH: ${{ github.workspace }}
           MODFLOW_DEVTOOLS_NO_AUTO_SYNC: 1
         # use --dist loadfile to so tests requiring pytest-virtualenv run on the same worker
-        run: uv run pytest -v -n auto --dist loadfile --durations 0 --ignore test_download.py --ignore test_models.py
-      
+        run: uv run pytest -v -n auto --dist loadfile --durations 0 --ignore test_download.py --ignore test_models.py --ignore test_dfn_registry.py
+
       - name: Run network-dependent tests
         # only invoke the GH API on one OS and Python version
         # to avoid rate limits (1000 rqs / hour / repository)
@@ -118,12 +118,20 @@ jobs:
         env:
           REPOS_PATH: ${{ github.workspace }}
           GITHUB_TOKEN: ${{ github.token }}
-          TEST_REPO: MODFLOW-ORG/modflow6-testmodels
-          TEST_REF: develop
-          TEST_SOURCE: modflow6-testmodels
-          TEST_SOURCE_NAME: mf6/test
-          MODFLOW_DEVTOOLS_NO_AUTO_SYNC: 1
-        run: uv run pytest -v -n auto --dist loadgroup --durations 0 test_download.py test_models.py
+          # DFNs API
+          TEST_DFNS_REPO: wpbonelli/modflow6
+          TEST_DFNS_REF: registry
+          TEST_DFNS_SOURCE: modflow6
+          # Models API
+          TEST_MODELS_REPO: MODFLOW-ORG/modflow6-testmodels
+          TEST_MODELS_REF: develop
+          TEST_MODELS_SOURCE: modflow6-testmodels
+          TEST_MODELS_SOURCE_NAME: mf6/test
+          # Programs API
+          TEST_PROGRAMS_REPO: MODFLOW-ORG/modflow6
+          TEST_PROGRAMS_REF: develop
+          TEST_PROGRAMS_SOURCE: modflow6
+        run: uv run pytest -v -n auto --dist loadgroup --durations 0 test_download.py test_models.py test_dfn_registry.py
 
   rtd:
     name: Docs

autotest/models.toml

@@ -0,0 +1,7 @@
+schema_version = "1.0"
+
+[files]
+
+[models]
+
+[examples]

autotest/test_dfn.py

@@ -4,10 +4,10 @@
 import pytest
 from packaging.version import Version
 
-from modflow_devtools.dfn import Dfn, _load_common, load, load_flat
-from modflow_devtools.dfn.fetch import fetch_dfns
-from modflow_devtools.dfn.schema.v1 import FieldV1
-from modflow_devtools.dfn.schema.v2 import FieldV2
+from modflow_devtools.dfns import Dfn, _load_common, load, load_flat
+from modflow_devtools.dfns.fetch import fetch_dfns
+from modflow_devtools.dfns.schema.v1 import FieldV1
+from modflow_devtools.dfns.schema.v2 import FieldV2
 from modflow_devtools.dfn2toml import convert, is_valid
 from modflow_devtools.markers import requires_pkg
 
@@ -384,7 +384,7 @@ def test_validate_nonexistent_file(function_tmpdir):
 
 def test_fieldv1_to_fieldv2_conversion():
     """Test that FieldV1 instances are properly converted to FieldV2."""
-    from modflow_devtools.dfn import map
+    from modflow_devtools.dfns import map
 
     dfn_v1 = Dfn(
         schema_version=Version("1"),
@@ -436,7 +436,7 @@ def test_fieldv1_to_fieldv2_conversion():
 
 def test_fieldv1_to_fieldv2_conversion_with_children():
     """Test that FieldV1 with nested children are properly converted to FieldV2."""
-    from modflow_devtools.dfn import map
+    from modflow_devtools.dfns import map
 
     # Create nested fields for a record
     child_field_v1 = FieldV1(
@@ -483,7 +483,7 @@ def test_fieldv1_to_fieldv2_conversion_with_children():
 
 def test_period_block_conversion():
     """Test period block recarray conversion to individual arrays."""
-    from modflow_devtools.dfn import map
+    from modflow_devtools.dfns import map
 
     dfn_v1 = Dfn(
         schema_version=Version("1"),
@@ -528,7 +528,7 @@ def test_period_block_conversion():
 
 def test_record_type_conversion():
     """Test record type with multiple scalar fields."""
-    from modflow_devtools.dfn import map
+    from modflow_devtools.dfns import map
 
     dfn_v1 = Dfn(
         schema_version=Version("1"),
@@ -571,7 +571,7 @@ def test_record_type_conversion():
 
 def test_keystring_type_conversion():
     """Test keystring type conversion."""
-    from modflow_devtools.dfn import map
+    from modflow_devtools.dfns import map
 
     dfn_v1 = Dfn(
         schema_version=Version("1"),