Unsafe automatic fixes

Author: bouweandela

esmvalcore/_main.py

@@ -80,7 +80,7 @@ def parse_resume(resume, recipe):
     return resume
 
 
-def process_recipe(recipe_file: Path, session):
+def process_recipe(recipe_file: Path, session) -> None:
     """Process recipe."""
     import datetime
     import shutil
@@ -318,7 +318,7 @@ def _copy_config_file(
         in_file: Path,
         out_file: Path,
         overwrite: bool,
-    ):
+    ) -> None:
         """Copy a configuration file."""
         import shutil
 

esmvalcore/_provenance.py

@@ -139,7 +139,7 @@ def __init__(
         attributes: dict[str, Any] | None = None,
         ancestors: Iterable[TrackedFile] | None = None,
         prov_filename: str | None = None,
-    ):
+    ) -> None:
         """Create an instance of a file with provenance tracking.
 
         Arguments
@@ -182,7 +182,7 @@ def attributes(self) -> dict[str, Any]:
         return self._attributes
 
     @attributes.setter
-    def attributes(self, value: dict[str, Any] | None):
+    def attributes(self, value: dict[str, Any] | None) -> None:
         """Set attributes describing the file."""
         self._attributes = value
 

esmvalcore/_recipe/from_datasets.py

@@ -5,7 +5,7 @@
 import itertools
 import logging
 import re
-from collections.abc import Iterable, Mapping, Sequence
+from collections.abc import Iterable, Mapping
 from functools import partial
 from typing import TYPE_CHECKING, Any
 
@@ -16,6 +16,7 @@
 from ._io import _load_recipe
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
     from pathlib import Path
 
     from esmvalcore.dataset import Dataset
@@ -114,7 +115,7 @@ def _to_frozen(item):
     return item
 
 
-def _move_one_level_up(base: dict, level: str, target: str):
+def _move_one_level_up(base: dict, level: str, target: str) -> None:
     """Move datasets one level up in the recipe."""
     groups = base[level]
     if not groups:

esmvalcore/_recipe/recipe.py

@@ -16,7 +16,7 @@
 
 from esmvalcore import __version__, esgf
 from esmvalcore._provenance import get_recipe_provenance
-from esmvalcore._task import BaseTask, DiagnosticTask, ResumeTask, TaskSet
+from esmvalcore._task import DiagnosticTask, ResumeTask, TaskSet
 from esmvalcore.config._config import TASKSEP
 from esmvalcore.config._dask import validate_dask_config
 from esmvalcore.config._diagnostics import TAGS
@@ -59,6 +59,7 @@
 if TYPE_CHECKING:
     from collections.abc import Iterable, Sequence
 
+    from esmvalcore._task import BaseTask
     from esmvalcore.config import Session
     from esmvalcore.io.protocol import DataElement
     from esmvalcore.typing import Facets

esmvalcore/_recipe/to_datasets.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import logging
-from collections.abc import Iterable, Iterator, Sequence
+from collections.abc import Iterable
 from copy import deepcopy
 from typing import TYPE_CHECKING, Any
 
@@ -23,6 +23,7 @@
 from ._io import _load_recipe
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator, Sequence
     from pathlib import Path
 
     from esmvalcore.config import Session

esmvalcore/_task.py

@@ -1,5 +1,7 @@
 """ESMValtool task definition."""
 
+from __future__ import annotations
+
 import abc
 import contextlib
 import datetime
@@ -810,11 +812,11 @@ def available_cpu_count() -> int:
 class TaskSet(set):
     """Container for tasks."""
 
-    def flatten(self) -> "TaskSet":
+    def flatten(self) -> TaskSet:
         """Flatten the list of tasks."""
         return TaskSet(t for task in self for t in task.flatten())
 
-    def get_independent(self) -> "TaskSet":
+    def get_independent(self) -> TaskSet:
         """Return a set of independent tasks."""
         independent_tasks = TaskSet()
         all_tasks = self.flatten()

esmvalcore/cmor/_fixes/cmip5/ec_earth.py

@@ -1,6 +1,8 @@
 """Fixes for EC-Earth model."""
 
-from collections.abc import Iterable
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 import iris
 import numpy as np
@@ -12,6 +14,9 @@
     cube_to_aux_coord,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 class Sic(Fix):
     """Fixes for sic."""

esmvalcore/cmor/_fixes/cmip6/cesm2.py

@@ -1,7 +1,9 @@
 """Fixes for CESM2 model."""
 
-from pathlib import Path
+from __future__ import annotations
+
 from shutil import copyfile
+from typing import TYPE_CHECKING
 
 import iris
 import iris.coords
@@ -18,6 +20,9 @@
     fix_ocean_depth_coord,
 )
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
 
 class Cl(Fix):
     """Fixes for ``cl``."""

esmvalcore/cmor/_fixes/cmip6/e3sm_1_1.py

@@ -1,10 +1,15 @@
 """Fixes for E3SM-1-1 model."""
 
-from iris.cube import Cube
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.preprocessor._shared import get_array_module
 
+if TYPE_CHECKING:
+    from iris.cube import Cube
+
 
 def _mask_greater(cube: Cube, value: float) -> Cube:
     """Mask all data of cube which is greater than ``value``."""

esmvalcore/cmor/_fixes/cmip6/ec_earth3_veg_lr.py

@@ -1,12 +1,17 @@
 """Fixes for EC-Earth3-Veg-LR model."""
 
-from collections.abc import Sequence
+from __future__ import annotations
 
-import iris.cube
+from typing import TYPE_CHECKING
 
 from esmvalcore.cmor._fixes.common import OceanFixGrid
 from esmvalcore.cmor._fixes.fix import Fix
 
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+    import iris.cube
+
 
 class AllVars(Fix):
     """Fixes for all variables."""