Prepare release 2026.6.0 (#487)

Author: HendrikKok

.teamcity/IMODCollector/buildTypes/IMODCollector_X64development.kt

@@ -44,7 +44,7 @@ object IMODCollector_X64development : BuildType({
             name = "Get coupler dependencies"
             workingDir = "coupler"
             scriptContent = """
-                pixi run -e dev install-imod-collector
+                pixi run -e dev fetch-imod-collector
             """.trimIndent()
         }
         script {

CHANGELOG.md

@@ -12,6 +12,31 @@ All notable changes to this project will be documented in this file.
 
 ### Removed
 
+## [v2026.6.0]
+
+### Added
+- Add continue logic for non-converging coupled simulations: when MODFLOW 6
+  `CONTINUE` is set in `mfsim.nam`, the coupler logs a warning instead of
+  raising an error on non-convergence
+- Add user acceptance test to CI pipeline
+- Add SonarQube buildstep to TeamCity pipeline
+- Add Deploy pipeline to TeamCity (PyPI publishing and GitHub releases)
+- Add pixi update build to TeamCity
+
+### Fixed
+- Fix silent crash when encountered an exception during unit tetst
+- Fix exchange logger not being closed after ribametamod run, causing file
+  lock errors on Windows
+
+### Changed
+- Update Ribasim to version v2026.1.1
+- Update MetaSWAP to version v9.0
+- Update MODFLOW6 to version 6.7.0
+- Rename `install-*` tasks to `fetch-*` in `pixi.toml` to better reflect
+  that these tasks download binaries rather than install packages
+- Rename `install-test-dependencies` to `setup-test-dependencies`
+
+
 ## [v2025.11.0]
 
 ### Changed

README.md

@@ -32,10 +32,10 @@ To develop `imod_coupler` locally:
    pixi install -e dev
    ```
 
-4. Install the test dependencies:
+4. Setup the test dependencies:
 
    ```sh
-   pixi run -e dev install-test-dependencies
+   pixi run -e dev setup-test-dependencies
    ```
 
    This command:

imod_coupler/__init__.py

@@ -1 +1 @@
-__version__ = "2024.3.0"
+__version__ = "2026.6.0"

imod_coupler/drivers/driver.py

@@ -86,7 +86,7 @@ def get_driver(
     config_dict: dict[str, Any], config_dir: Path, base_config: BaseConfig
 ) -> Driver:
     from imod_coupler.drivers.metamod.config import MetaModConfig
-    from imod_coupler.drivers.metamod.metamod import MetaMod, MetaModNewton
+    from imod_coupler.drivers.metamod.metamod import MetaMod
     from imod_coupler.drivers.ribametamod.config import RibaMetaModConfig
     from imod_coupler.drivers.ribametamod.ribametamod import RibaMetaMod
     from imod_coupler.drivers.ribamod.config import RibaModConfig
@@ -100,7 +100,10 @@ def get_driver(
     if base_config.driver_type == "metamod":
         metamod_config = MetaModConfig(config_dir=config_dir, **config_dict["driver"])
         if base_config.modflow_newton_formulation:
-            return MetaModNewton(base_config, metamod_config)
+            raise NotImplementedError(
+                "The MODFLOW Newton formulation is not yet implemented for MetaMod. "
+                "Please set modflow_newton_formulation to false in the config file."
+            )
         return MetaMod(base_config, metamod_config)
     elif base_config.driver_type == "ribamod":
         ribamod_config = RibaModConfig(config_dir=config_dir, **config_dict["driver"])

imod_coupler/drivers/ribametamod/ribametamod.py

@@ -491,6 +491,7 @@ def finalize(self) -> None:
             self.ribasim.finalize()
         for coupling in self.couplings.values():
             coupling.finalize_log()
+        self.exchange_logger.finalize()
 
     def exchange_rib2mod(self) -> None:
         self.ribasim.update_subgrid_level()

pixi.toml

@@ -34,14 +34,14 @@ pyinstaller = "*" # Use pypi version instead of condforge due to issues with the
 ribasim = "==2026.1.1"
 
 [feature.common.tasks]
-# Install
-install-ribasim = { cmd = "python scripts/download_ribasim.py 2026.1.1 ./.imod_collector/develop/ribasim", cwd="." }
-install-modflow = { cmd = "python scripts/download_modflow.py 6.7.0 ./.imod_collector/develop/modflow6", cwd="." }
-install-metaswap = "aws s3 cp s3://metaswap/releases/r2410 ./.imod_collector/develop/metaswap --recursive --no-sign-request --endpoint-url https://s3.deltares.nl --no-verify-ssl"
-install-metaswap-test-db = "aws s3 cp s3://metaswap/db/LHM2016_v01vrz ./.imod_collector/LHM2016_v01vrz --recursive --no-sign-request --endpoint-url https://s3.deltares.nl --no-verify-ssl"
-
-install-imod-collector = { depends-on = ["install-metaswap", "install-ribasim", "install-modflow"] }
-install-imod-collector-regression = "python scripts/download_regression.py 2025.11.0 ./.imod_collector/regression"
+# Fetch binaries
+fetch-ribasim = { cmd = "python scripts/download_ribasim.py 2026.1.1 ./.imod_collector/develop/ribasim", cwd="." }
+fetch-modflow = { cmd = "python scripts/download_modflow.py 6.7.0 ./.imod_collector/develop/modflow6", cwd="." }
+fetch-metaswap = "aws s3 cp s3://metaswap/releases/r2410 ./.imod_collector/develop/metaswap --recursive --no-sign-request --endpoint-url https://s3.deltares.nl --no-verify-ssl"
+fetch-metaswap-test-db = "aws s3 cp s3://metaswap/db/LHM2016_v01vrz ./.imod_collector/LHM2016_v01vrz --recursive --no-sign-request --endpoint-url https://s3.deltares.nl --no-verify-ssl"
+
+fetch-imod-collector = { depends-on = ["fetch-metaswap", "fetch-ribasim", "fetch-modflow"] }
+fetch-imod-collector-regression = "python scripts/download_regression.py 2025.11.0 ./.imod_collector/regression"
 generate-env-file = "python scripts/generate_env_file.py"
 
 # Tests
@@ -68,11 +68,11 @@ twine = "*"
 mypy2junit = "*"
 
 [feature.dev.tasks]
-# Install
-install-test-dependencies = { depends-on = [
-    "install-metaswap-test-db",
-    "install-imod-collector",
-    "install-imod-collector-regression",
+# Setup
+setup-test-dependencies = { depends-on = [
+    "fetch-metaswap-test-db",
+    "fetch-imod-collector",
+    "fetch-imod-collector-regression",
     "generate-env-file",
 ] }
 

pre-processing/primod/__init__.py

@@ -18,4 +18,4 @@
     "RibaModPassiveDriverCoupling",
 )
 
-__version__ = "2024.3.0"
+__version__ = "2026.6.0"

tests/test_imod_coupler/test_metamod_cases.py

@@ -212,6 +212,7 @@ def case_newton(
     )
 
 
+@pytest.mark.skip(reason="Inactive since we raise a NotImplementedError for now")
 def case_newton_perched(
     coupled_mf6_model_newton_perched: Modflow6Simulation,
     prepared_msw_model_newton_perched: MetaSwapModel,