Skip to content

Commit cd0f5ac

Browse files
committed
only develop branch in bootstrap file, fix tests
1 parent 943f1c3 commit cd0f5ac

2 files changed

Lines changed: 11 additions & 14 deletions

File tree

autotest/test_models.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -550,8 +550,11 @@ def test_sync_and_list_models(self):
550550
class TestMakeRegistry:
551551
"""Test registry creation tool (make_registry.py)."""
552552

553-
def _get_constructed_url(self, mode, repo, ref, **kwargs):
554-
"""Helper to extract constructed URL from make_registry verbose output."""
553+
def _get_constructed_url(self, repo, ref, **kwargs):
554+
"""Helper to extract constructed URL from make_registry verbose output.
555+
556+
Mode is now inferred from presence of asset_file in kwargs.
557+
"""
555558
import tempfile
556559

557560
# Create a temporary directory to use as dummy path
@@ -561,8 +564,6 @@ def _get_constructed_url(self, mode, repo, ref, **kwargs):
561564
sys.executable,
562565
"-m",
563566
"modflow_devtools.models.make_registry",
564-
"--mode",
565-
mode,
566567
"--repo",
567568
repo,
568569
"--ref",
@@ -587,7 +588,6 @@ def _get_constructed_url(self, mode, repo, ref, **kwargs):
587588
def test_url_construction_version(self):
588589
"""Test URL construction for version mode (auto-detects path from directory)."""
589590
url = self._get_constructed_url(
590-
mode="version",
591591
repo="MODFLOW-ORG/modflow6-testmodels",
592592
ref="master",
593593
name="mf6/test",
@@ -600,7 +600,6 @@ def test_url_construction_version(self):
600600
def test_url_construction_version_different_ref(self):
601601
"""Test URL construction for version mode with different ref."""
602602
url = self._get_constructed_url(
603-
mode="version",
604603
repo="MODFLOW-ORG/modflow6-largetestmodels",
605604
ref="develop",
606605
name="mf6/large",
@@ -612,7 +611,6 @@ def test_url_construction_version_different_ref(self):
612611
def test_url_construction_release(self):
613612
"""Test URL construction for release mode."""
614613
url = self._get_constructed_url(
615-
mode="release",
616614
repo="MODFLOW-ORG/modflow6-examples",
617615
ref="current",
618616
asset_file="mf6examples.zip",
@@ -626,7 +624,6 @@ def test_url_construction_release(self):
626624
def test_url_construction_release_custom(self):
627625
"""Test URL construction for release mode with custom repo/tag."""
628626
url = self._get_constructed_url(
629-
mode="release",
630627
repo="username/my-models",
631628
ref="v1.0.0",
632629
asset_file="models.zip",

modflow_devtools/models/models.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
# repo = "username/my-models"
1919
# refs = ["main"]
2020

21-
[sources.modflow6-testmodels]
22-
repo = "MODFLOW-ORG/modflow6-testmodels"
23-
name = "mf6/test"
24-
refs = ["develop", "master"]
25-
2621
[sources.modflow6-examples]
2722
repo = "MODFLOW-ORG/modflow6-examples"
2823
name = "mf6/example"
2924
refs = ["current"]
3025

26+
[sources.modflow6-testmodels]
27+
repo = "MODFLOW-ORG/modflow6-testmodels"
28+
name = "mf6/test"
29+
refs = ["develop"]
30+
3131
[sources.modflow6-largetestmodels]
3232
repo = "MODFLOW-ORG/modflow6-largetestmodels"
3333
name = "mf6/large"
34-
refs = ["develop", "master"]
34+
refs = ["develop"]

0 commit comments

Comments
 (0)