Update pre-commit, run and fix issues

Author: mkstratos

.pre-commit-config.yaml

@@ -1,21 +1,24 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v6.0.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: check-toml
-  - repo: https://github.com/psf/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
+      - id: check-yaml
+        args: [--unsafe]
+      - id: debug-statements
+      - id: destroyed-symlinks
+      - id: detect-private-key
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.3.7
+    rev: v0.13.0
     hooks:
       # Run the linter.
-      - id: ruff
+      - id: ruff-check
+      # Run the formatter.
+      - id: ruff-format
+  - repo: https://github.com/pycqa/isort
+    rev: 6.0.1
+    hooks:
+      - id: isort

evv4esm/ensembles/tools.py

@@ -29,6 +29,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """General tools for working with ensembles."""
+
 import os
 
 import matplotlib.pyplot as plt

evv4esm/extensions/ks_vars.json

@@ -235,4 +235,4 @@
     "cosp_sunlit",
     "isccp_cldtot"
   ]
-}
+}

evv4esm/extensions/kso.py

@@ -43,6 +43,7 @@
 an empirically derived approximate null distribution of t using resampling
 techniques.
 """
+
 import argparse
 import os
 from collections import OrderedDict
@@ -386,7 +387,6 @@ def main(args):
     images = {"accept": [], "reject": [], "-": []}
     details = LIVVDict()
     for var in sorted(test_vars):
-
         var_1 = e3sm.load_mpas_climatology_ensemble(ens_files[key1], var)
         var_2 = e3sm.load_mpas_climatology_ensemble(ens_files[key2], var)
 

evv4esm/extensions/pg.py

@@ -36,6 +36,7 @@
 simulation for many initial conditions, with each initial condition subject to
 multiple perturbations.
 """
+
 import argparse
 import math
 import os
@@ -220,7 +221,6 @@ def _print_details(details):
 
 
 def main(args):
-
     nvar = len(args.variables)
     nprt = len(args.perturbations)
 

evv4esm/extensions/tsc.py

@@ -227,10 +227,11 @@ def main(args):
             for ff in truth_files
         ]
         for tt, time in enumerate(times):
-            with Dataset(truth_ens[instance][tt]) as truth, Dataset(
-                ref_ens[instance][tt]
-            ) as ref, Dataset(test_ens[instance][tt]) as test:
-
+            with (
+                Dataset(truth_ens[instance][tt]) as truth,
+                Dataset(ref_ens[instance][tt]) as ref,
+                Dataset(test_ens[instance][tt]) as test,
+            ):
                 truth_plt, truth_ps = pressure_layer_thickness(truth)
                 ref_plt, ref_ps = pressure_layer_thickness(ref)
                 test_plt, test_ps = pressure_layer_thickness(test)
@@ -809,7 +810,6 @@ def boxplot_delta_rmsd(args, delta_rmsd, null_hypothesis, img_file_format):
             list(ax1.get_yticklabels()),
             list(ax2.get_yticklabels()),
         ):
-
             land_var_color = pf_color_picker[
                 null_hypothesis[
                     (null_hypothesis["seconds"] == time)
@@ -996,7 +996,6 @@ def errorbars_delta_rmsd(args, delta_rmsd, null_hypothesis, img_file_format):
         for ii, var1, var2 in zip(
             yvals - 1, list(ax1.get_yticklabels()), list(ax2.get_yticklabels())
         ):
-
             var1.set_color(land_colors[ii])
             var2.set_color(ocean_colors[ii])
 

evv4esm/utils.py

@@ -53,7 +53,7 @@ def bib2html(bib, style=None, backend=None):
         return _bib2html_bibdata(bib, style=style, backend=backend)
     else:
         raise NotImplementedError(
-            "I do not now how to convert a {} type to a bibliography".format(type(bib))
+            f"I do not now how to convert a {type(bib)} type to a bibliography"
         )
 
 

test/MVKO_template.json

@@ -13,4 +13,4 @@
         "alpha": 0.05,
         "hist-name": "hist.am.timeSeriesStatsClimatology"
     }
-}
+}

test/MVKxx_template.json

@@ -11,4 +11,4 @@
         "img-fmt": "png",
         "hist-name": "h"
     }
-}
+}

test/test_evv.py

@@ -60,11 +60,14 @@ def gen_data_run_evv(evv_test):
 def test_evv_mvko():
     gen_data_run_evv("MVKO")
 
+
 def test_evv_mvkxx():
     gen_data_run_evv("MVKxx")
 
+
 def test_evv_tsc():
     gen_data_run_evv("TSC")
 
+
 def test_evv_mvk():
     gen_data_run_evv("MVK")