From 783a9c9ef08b6d89e20d5b6f79f54a19ed552e71 Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Wed, 20 Sep 2023 10:25:08 +0200 Subject: [PATCH] Rename esmvaltool.models to esmvaltool.schema When we talk about models we mean hydrological models. --- src/ewatercycle/base/forcing.py | 2 +- src/ewatercycle/esmvaltool/builder.py | 2 +- src/ewatercycle/esmvaltool/datasets.py | 2 +- src/ewatercycle/esmvaltool/run.py | 2 +- src/ewatercycle/esmvaltool/{models.py => schema.py} | 2 +- src/ewatercycle/plugins/hype/forcing.py | 2 +- src/ewatercycle/plugins/lisflood/forcing.py | 2 +- src/ewatercycle/plugins/marrmot/forcing.py | 2 +- src/ewatercycle/plugins/pcrglobwb/forcing.py | 2 +- src/ewatercycle/plugins/wflow/forcing.py | 2 +- tests/src/esmvaltool/test_builder.py | 2 +- tests/src/esmvaltool/{test_models.py => test_schema.py} | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename src/ewatercycle/esmvaltool/{models.py => schema.py} (98%) rename tests/src/esmvaltool/{test_models.py => test_schema.py} (96%) diff --git a/src/ewatercycle/base/forcing.py b/src/ewatercycle/base/forcing.py index 7235ee6f..e53afcbf 100644 --- a/src/ewatercycle/base/forcing.py +++ b/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__) diff --git a/src/ewatercycle/esmvaltool/builder.py b/src/ewatercycle/esmvaltool/builder.py index 9944cd00..382126be 100644 --- a/src/ewatercycle/esmvaltool/builder.py +++ b/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, diff --git a/src/ewatercycle/esmvaltool/datasets.py b/src/ewatercycle/esmvaltool/datasets.py index f6f0b2cf..2fb380f4 100644 --- a/src/ewatercycle/esmvaltool/datasets.py +++ b/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( diff --git a/src/ewatercycle/esmvaltool/run.py b/src/ewatercycle/esmvaltool/run.py index 5349bbfd..0fbf5cb1 100644 --- a/src/ewatercycle/esmvaltool/run.py +++ b/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__) diff --git a/src/ewatercycle/esmvaltool/models.py b/src/ewatercycle/esmvaltool/schema.py similarity index 98% rename from src/ewatercycle/esmvaltool/models.py rename to src/ewatercycle/esmvaltool/schema.py index a26d5109..ea8bcff0 100644 --- a/src/ewatercycle/esmvaltool/models.py +++ b/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 diff --git a/src/ewatercycle/plugins/hype/forcing.py b/src/ewatercycle/plugins/hype/forcing.py index ff1cc1c6..4eca1eac 100644 --- a/src/ewatercycle/plugins/hype/forcing.py +++ b/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): diff --git a/src/ewatercycle/plugins/lisflood/forcing.py b/src/ewatercycle/plugins/lisflood/forcing.py index 366850cf..97b924d2 100644 --- a/src/ewatercycle/plugins/lisflood/forcing.py +++ b/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, diff --git a/src/ewatercycle/plugins/marrmot/forcing.py b/src/ewatercycle/plugins/marrmot/forcing.py index 9d5a5f3c..44e08125 100644 --- a/src/ewatercycle/plugins/marrmot/forcing.py +++ b/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): diff --git a/src/ewatercycle/plugins/pcrglobwb/forcing.py b/src/ewatercycle/plugins/pcrglobwb/forcing.py index c356e148..cf5e5484 100644 --- a/src/ewatercycle/plugins/pcrglobwb/forcing.py +++ b/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 diff --git a/src/ewatercycle/plugins/wflow/forcing.py b/src/ewatercycle/plugins/wflow/forcing.py index e5ac4214..9536a07d 100644 --- a/src/ewatercycle/plugins/wflow/forcing.py +++ b/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): diff --git a/tests/src/esmvaltool/test_builder.py b/tests/src/esmvaltool/test_builder.py index 63332fe7..d5ad4fd5 100644 --- a/tests/src/esmvaltool/test_builder.py +++ b/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 diff --git a/tests/src/esmvaltool/test_models.py b/tests/src/esmvaltool/test_schema.py similarity index 96% rename from tests/src/esmvaltool/test_models.py rename to tests/src/esmvaltool/test_schema.py index 13cf3473..da58f1f3 100644 --- a/tests/src/esmvaltool/test_models.py +++ b/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