Rename esmvaltool.models to esmvaltool.schema

When we talk about models we mean hydrological models.

src/ewatercycle/base/forcing.py

@@ -38,8 +38,8 @@
     build_generic_distributed_forcing_recipe,
     build_generic_lumped_forcing_recipe,
 )
-from ewatercycle.esmvaltool.models import Dataset, Recipe
 from ewatercycle.esmvaltool.run import run_recipe
+from ewatercycle.esmvaltool.schema import Dataset, Recipe
 from ewatercycle.util import get_time, to_absolute_path
 
 logger = logging.getLogger(__name__)

src/ewatercycle/esmvaltool/builder.py

@@ -8,7 +8,7 @@
 
 from ewatercycle.esmvaltool.datasets import DATASETS
 from ewatercycle.esmvaltool.diagnostic import copier
-from ewatercycle.esmvaltool.models import (
+from ewatercycle.esmvaltool.schema import (
     ClimateStatistics,
     Dataset,
     Diagnostic,

src/ewatercycle/esmvaltool/datasets.py

@@ -1,6 +1,6 @@
 """Forcing datasets."""
 
-from ewatercycle.esmvaltool.models import Dataset
+from ewatercycle.esmvaltool.schema import Dataset
 
 DATASETS = {
     "ERA5": Dataset(

src/ewatercycle/esmvaltool/run.py

@@ -7,7 +7,7 @@
 from esmvalcore.experimental.recipe import Recipe as ESMValToolRecipe
 from esmvalcore.experimental.recipe_output import DataFile, ImageFile, RecipeOutput
 
-from ewatercycle.esmvaltool.models import Recipe
+from ewatercycle.esmvaltool.schema import Recipe
 
 logger = logging.getLogger(__name__)
 

src/ewatercycle/esmvaltool/models.py → src/ewatercycle/esmvaltool/schema.py

@@ -1,4 +1,4 @@
-"""ESMValTool recipe Pydantic models and preprocessor types.
+"""ESMValTool recipe schema and preprocessor types.
 
 The classes and their attributes in this module are based
 on the ESMValTool recipe schema at

src/ewatercycle/plugins/hype/forcing.py

@@ -8,7 +8,7 @@
 
 from ewatercycle.base.forcing import DefaultForcing
 from ewatercycle.esmvaltool.builder import RecipeBuilder
-from ewatercycle.esmvaltool.models import Dataset
+from ewatercycle.esmvaltool.schema import Dataset
 
 
 class HypeForcing(DefaultForcing):

src/ewatercycle/plugins/lisflood/forcing.py

@@ -6,7 +6,7 @@
 
 from ewatercycle.base.forcing import DefaultForcing
 from ewatercycle.esmvaltool.builder import RecipeBuilder
-from ewatercycle.esmvaltool.models import Dataset, Recipe, TargetGrid
+from ewatercycle.esmvaltool.schema import Dataset, Recipe, TargetGrid
 from ewatercycle.plugins.lisflood.lisvap import create_lisvap_config, lisvap
 from ewatercycle.util import (
     fit_extents_to_grid,

src/ewatercycle/plugins/marrmot/forcing.py

@@ -10,7 +10,7 @@
 
 from ewatercycle.base.forcing import DefaultForcing
 from ewatercycle.esmvaltool.builder import RecipeBuilder
-from ewatercycle.esmvaltool.models import Dataset, Recipe
+from ewatercycle.esmvaltool.schema import Dataset, Recipe
 
 
 class MarrmotForcing(DefaultForcing):

src/ewatercycle/plugins/pcrglobwb/forcing.py

@@ -6,7 +6,7 @@
 
 from ewatercycle.base.forcing import DefaultForcing
 from ewatercycle.esmvaltool.builder import RecipeBuilder
-from ewatercycle.esmvaltool.models import ClimateStatistics, Dataset, ExtractRegion
+from ewatercycle.esmvaltool.schema import ClimateStatistics, Dataset, ExtractRegion
 from ewatercycle.util import get_time
 
 

src/ewatercycle/plugins/wflow/forcing.py

@@ -5,7 +5,7 @@
 
 from ewatercycle.base.forcing import DefaultForcing
 from ewatercycle.esmvaltool.builder import RecipeBuilder
-from ewatercycle.esmvaltool.models import Dataset
+from ewatercycle.esmvaltool.schema import Dataset
 
 
 class WflowForcing(DefaultForcing):

tests/src/esmvaltool/test_builder.py

@@ -7,7 +7,7 @@
     build_generic_distributed_forcing_recipe,
     build_generic_lumped_forcing_recipe,
 )
-from ewatercycle.esmvaltool.models import Dataset
+from ewatercycle.esmvaltool.schema import Dataset
 from ewatercycle.testing.helpers import reyamlify
 
 

tests/src/esmvaltool/test_models.py → tests/src/esmvaltool/test_schema.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from ewatercycle.esmvaltool.models import Recipe
+from ewatercycle.esmvaltool.schema import Recipe
 from ewatercycle.testing.helpers import reyamlify