Revert "[pre-commit.ci] auto fixes from pre-commit.com hooks"

This reverts commit f905f39.

.editorconfig

@@ -27,3 +27,4 @@ indent_size = 2
 
 [*.{md,Rmd}]
 trim_trailing_whitespace = false
+

.github/CODEOWNERS

@@ -1,2 +1,3 @@
 esmvalcore/cmor @jvegasbsc
 .github/workflows @valeriupredoi
+

CITATION.cff

@@ -208,7 +208,7 @@ authors:
     affiliation: "DLR, Germany"
     family-names: Cammarano
     given-names: Diego
-  -
+  - 
     affiliation: "ACCESS-NRI, Australia"
     family-names: Yousong
     given-names: Zeng

NOTICE

@@ -50,3 +50,5 @@ In addition to using the Software, we encourage the community to join the Softwa
 To join the ESMValTool Development Team, please contact Dr. Birgit Hassler (birgit.hassler@dlr.de) and Dr. Axel Lauer (axel.lauer@dlr.de).
 
 ==========================================
+
+

doc/contributing.rst

@@ -743,15 +743,15 @@ Perform the steps listed below with two persons, to reduce the risk of error.
    `PyPI <https://pypi.org/project/ESMValCore/>`__, and
    `readthedocs <https://readthedocs.org/dashboard/esmvalcore/users/>`__.
 
-The release of ESMValCore is tied to the release of ESMValTool.
+The release of ESMValCore is tied to the release of ESMValTool. 
 The detailed steps can be found in the ESMValTool
 :ref:`documentation <esmvaltool:release_steps>`.
-To start the procedure, ESMValCore gets released as a
+To start the procedure, ESMValCore gets released as a 
 release candidate to test the recipes in ESMValTool. If bugs are found
-during the testing phase of the release candidate, make as many release
-candidates for ESMValCore as needed in order to fix them.
+during the testing phase of the release candidate, make as many release 
+candidates for ESMValCore as needed in order to fix them. 
 
-To make a new release of the package, be it a release candidate or the final release,
+To make a new release of the package, be it a release candidate or the final release, 
 follow these steps:
 
 1. Check that all tests and builds work
@@ -795,13 +795,13 @@ Use the script
 to create create a draft of the release notes.
 This script uses the titles and labels of merged pull requests since the
 previous release.
-Open a discussion to allow members of the development team to nominate pull
-requests as highlights. Add the most voted pull requests as highlights at the
-beginning of changelog. After the highlights section, list any backward
-incompatible changes that the release may include. The
+Open a discussion to allow members of the development team to nominate pull 
+requests as highlights. Add the most voted pull requests as highlights at the 
+beginning of changelog. After the highlights section, list any backward 
+incompatible changes that the release may include. The 
 :ref:`backward compatibility policy<esmvaltool:backward-compatibility-policy>`.
-lists the information that should be provided by the developer of any backward
-incompatible change. Make sure to also list any deprecations that the release
+lists the information that should be provided by the developer of any backward 
+incompatible change. Make sure to also list any deprecations that the release 
 may include, as well as a brief description on how to upgrade a deprecated feature.
 Review the results, and if anything needs changing, change it on GitHub and
 re-run the script until the changelog looks acceptable.

doc/quickstart/install.rst

@@ -201,7 +201,7 @@ Pre-installed versions on HPC clusters / other servers
 
 
 If you would like to use pre-installed versions on HPC clusters (currently CEDA-JASMIN and DKRZ-Levante),
-and other servers (currently Met Office Linux estate), please have a look at
+and other servers (currently Met Office Linux estate), please have a look at 
 :ref:`these instructions <esmvaltool:install_on_hpc>`.
 
 

doc/quickstart/run.rst

@@ -79,7 +79,7 @@ This feature is available for projects that are hosted on the ESGF, i.e.
 CMIP3, CMIP5, CMIP6, CORDEX, and obs4MIPs.
 
 To control the strictness of the CMOR checker and the checks during concatenation
-on auxiliary coordinates, supplementary variables, and derived coordinates,
+on auxiliary coordinates, supplementary variables, and derived coordinates, 
 use the flag ``--check_level``:
 
 .. code:: bash

doc/recipe/index.rst

@@ -8,4 +8,4 @@ The recipe format
 
     Overview <overview>
     Preprocessor <preprocessor>
-
+ 

esmvalcore/_citation.py

@@ -38,7 +38,8 @@
 
 
 def _write_citation_files(filename, provenance):
-    """Write citation information provided by the recorded provenance.
+    """
+    Write citation information provided by the recorded provenance.
 
     Recipe and cmip6 data references are saved into one bibtex file.
     cmip6 data references are provided by CMIP6 data citation service.
@@ -134,9 +135,9 @@ def _save_citation_info_txt(product_name, info_urls, other_info):
 def _extract_tags(tags):
     """Extract tags.
 
-    Tags are recorded as a list of strings converted to a string in
-    provenance. For example, a single entry in the list `tags` could be
-    the string "['acknow_project', 'acknow_author']".
+    Tags are recorded as a list of strings converted to a string in provenance.
+    For example, a single entry in the list `tags` could be the string
+    "['acknow_project', 'acknow_author']".
     """
     pattern = re.compile(r'[\w-]+')
     return set(pattern.findall(str(tags)))

esmvalcore/_main.py

@@ -206,8 +206,8 @@ def get_config_developer(cls, overwrite=False, path=None):
 class Recipes():
     """List, show and retrieve installed recipes.
 
-    This group contains utilities to explore and manage the recipes
-    available in your installation of ESMValTool.
+    This group contains utilities to explore and manage the recipes available
+    in your installation of ESMValTool.
 
     Documentation for recipes included with ESMValTool is available at
     https://docs.esmvaltool.org/en/latest/recipes/index.html.
@@ -294,8 +294,7 @@ class ESMValTool():
     multiple models, either against predecessor versions or against
     observations.
 
-    Documentation is available at
-    https://docs.esmvaltool.org.
+    Documentation is available at https://docs.esmvaltool.org.
 
     To report issues or ask for improvements, please visit
     https://github.com/ESMValGroup/ESMValTool.

esmvalcore/_recipe/recipe.py

@@ -399,14 +399,12 @@ def _update_multiproduct(input_products, order, preproc_dir, step):
     """Return new products that are aggregated over multiple datasets.
 
     These new products will replace the original products at runtime.
-    Therefore, they need to have all the settings for the remaining
-    steps.
-
-    The functions in _multimodel.py take output_products as function
-    arguments. These are the output_products created here. But since
-    those functions are called from the input products, the products
-    that are created here need to be added to their ancestors products'
-    settings ().
+    Therefore, they need to have all the settings for the remaining steps.
+
+    The functions in _multimodel.py take output_products as function arguments.
+    These are the output_products created here. But since those functions are
+    called from the input products, the products that are created here need to
+    be added to their ancestors products' settings ().
     """
     products = {p for p in input_products if step in p.settings}
     if not products:

esmvalcore/cmor/_fixes/__init__.py

@@ -1,5 +1,6 @@
-"""Automatic fixes for input data.
+"""
+Automatic fixes for input data
 
-Module to apply automatic fixes at different levels to input data for
-known errors.
+Module to apply automatic fixes at different levels to input data for known
+errors.
 """

esmvalcore/cmor/_fixes/cesm/cesm2.py

@@ -12,6 +12,7 @@
 (esmvalcore/_config/extra_facets/cesm-mappings.yml) and/or add classes to this
 file for variables that need more complex fixes (see
 esmvalcore/cmor/_fixes/emac/emac.py for examples).
+
 """
 
 import logging
@@ -63,6 +64,7 @@ def _fix_time(self, cube):
         Example of monthly time coordinate after this fix (Jan. & Feb. 2000):
             Points: ``[2000-01-15, 2000-02-14]``
             Bounds: ``[[2000-01-01, 2000-02-01], [2000-02-01, 2000-03-01]]``
+
         """
         # Only modify time points if data contains a time dimension, is monthly
         # data, and does not describe point measurements.

esmvalcore/cmor/_fixes/cmip5/access1_0.py

@@ -10,7 +10,8 @@ class AllVars(Fix):
     """Common fixes to all vars."""
 
     def fix_metadata(self, cubes):
-        """Fix metadata.
+        """
+        Fix metadata.
 
         Fixes wrong calendar 'gregorian' instead of 'proleptic_gregorian'.
 
@@ -22,6 +23,7 @@ def fix_metadata(self, cubes):
         Returns
         -------
         iris.cube.CubeList
+
         """
         for cube in cubes:
             try:

esmvalcore/cmor/_fixes/cmip5/access1_3.py

@@ -5,6 +5,7 @@
 from ..fix import Fix
 from .access1_0 import Cl as BaseCl
 
+
 Cl = BaseCl
 
 
@@ -24,6 +25,7 @@ def fix_metadata(self, cubes):
         Returns
         -------
         iris.cube.CubeList
+
         """
         for cube in cubes:
             try:

esmvalcore/cmor/_fixes/cmip5/bnu_esm.py

@@ -10,7 +10,8 @@ class Cl(ClFixHybridPressureCoord):
     """Fixes for cl."""
 
     def fix_data(self, cube):
-        """Fix data.
+        """
+        Fix data.
 
         Fixes discrepancy between declared units and real units
 
@@ -22,6 +23,7 @@ def fix_data(self, cube):
         Returns
         -------
         iris.cube.Cube
+
         """
         metadata = cube.metadata
         cube *= 100
@@ -33,7 +35,8 @@ class FgCo2(Fix):
     """Fixes for fgco2."""
 
     def fix_metadata(self, cubes):
-        """Fix metadata.
+        """
+        Fix metadata.
 
         Fixes cube units.
 
@@ -45,12 +48,14 @@ def fix_metadata(self, cubes):
         Returns
         -------
         iris.cube.CubeList
+
         """
         self.get_cube_from_list(cubes).units = Unit('kg m-2 s-1')
         return cubes
 
     def fix_data(self, cube):
-        """Fix data.
+        """
+        Fix data.
 
         Fixes cube units.
 
@@ -62,6 +67,7 @@ def fix_data(self, cube):
         Returns
         -------
         iris.cube.Cube
+
         """
         metadata = cube.metadata
         cube *= 12.0 / 44.0
@@ -73,7 +79,8 @@ class Ch4(Fix):
     """Fixes for ch4."""
 
     def fix_metadata(self, cubes):
-        """Fix metadata.
+        """
+        Fix metadata.
 
         Fixes cube units.
 
@@ -85,12 +92,14 @@ def fix_metadata(self, cubes):
         Returns
         -------
         iris.cube.CubeList
+
         """
         self.get_cube_from_list(cubes).units = Unit('1e-9')
         return cubes
 
     def fix_data(self, cube):
-        """Fix metadata.
+        """
+        Fix metadata.
 
         Fixes cube units.
 
@@ -103,6 +112,7 @@ def fix_data(self, cube):
         Returns
         -------
         iris.cube.Cube
+
         """
         metadata = cube.metadata
         cube *= 29.0 / 16.0 * 1.e9
@@ -114,7 +124,8 @@ class Co2(Fix):
     """Fixes for co2."""
 
     def fix_metadata(self, cubes):
-        """Fix metadata.
+        """
+        Fix metadata.
 
         Fixes cube units.
 
@@ -126,12 +137,14 @@ def fix_metadata(self, cubes):
         Returns
         -------
         iris.cube.CubeList
+
         """
         self.get_cube_from_list(cubes).units = Unit('1e-6')
         return cubes
 
     def fix_data(self, cube):
-        """Fix data.
+        """
+        Fix data.
 
         Fixes cube units.
 
@@ -143,6 +156,7 @@ def fix_data(self, cube):
         Returns
         -------
         iris.cube.Cube
+
         """
         metadata = cube.metadata
         cube *= 29.0 / 44.0 * 1.e6
@@ -154,7 +168,8 @@ class SpCo2(Fix):
     """Fixes for spco2."""
 
     def fix_data(self, cube):
-        """Fix data.
+        """
+        Fix data.
 
         Fixes cube units.
 
@@ -166,6 +181,7 @@ def fix_data(self, cube):
         Returns
         -------
         iris.cube.Cube
+
         """
         metadata = cube.metadata
         cube *= 1.e6
@@ -177,7 +193,8 @@ class Od550Aer(Fix):
     """Fixes for od550aer."""
 
     def fix_data(self, cube):
-        """Fix data.
+        """
+        Fix data.
 
         Masks invalid values.
 
@@ -189,6 +206,7 @@ def fix_data(self, cube):
         Returns
         -------
         iris.cube.Cube
+
         """
         data = da.ma.masked_equal(cube.core_data(), 1.e36)
         return cube.copy(data)

esmvalcore/cmor/_fixes/cmip5/canesm2.py

@@ -2,14 +2,16 @@
 from ..common import ClFixHybridPressureCoord
 from ..fix import Fix
 
+
 Cl = ClFixHybridPressureCoord
 
 
 class FgCo2(Fix):
     """Fixes for fgco2."""
 
     def fix_data(self, cube):
-        """Fix data.
+        """
+        Fix data.
 
         Fixes discrepancy between declared units and real units
 
@@ -21,6 +23,7 @@ def fix_data(self, cube):
         Returns
         -------
         iris.cube.Cube
+
         """
         metadata = cube.metadata
         cube *= 12.0 / 44.0