Update pre-commit dependencies and ruff hook ID (#991)

Co-authored-by: Tom Vo <[email protected]>

Author: altheaden

.pre-commit-config.yaml

@@ -11,20 +11,20 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.2
+    rev: v0.12.2
     hooks:
       # Sort the imports
-      - id: ruff
+      - id: ruff-check
         name: ruff-sort-imports
         args: [--select, I, --fix]
       # Run the linter.
-      - id: ruff
+      - id: ruff-check
         args: [--fix]
       # Run the formatter.
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.1
+    rev: v1.16.1
     hooks:
       - id: mypy
         args: [--config=pyproject.toml]

conda-env/dev.yml

@@ -39,10 +39,10 @@ dependencies:
   # =======================
   # Run `pre-commit autoupdate` to get the latest pinned versions of 'rev' in
   # `.pre-commit.config.yaml`, then update the pinned versions here.
-  - pre-commit >=3.0.0
+  - pre-commit >=4.2.0
   - types-PyYAML >=6.0.0
-  - ruff=0.9.2
-  - mypy=1.14.1
+  - ruff=0.12.2
+  - mypy=1.16.1
   # Developer Tools
   # =======================
   - tbump=6.9.0

e3sm_diags/driver/qbo_driver.py

@@ -319,7 +319,7 @@ def _get_psd_from_deseason(xraw, period_new):
     # (interpolating values of amplitude0_flipped and psd_x0_flipped from period0_flipped to period_new).
     # For that interpolation, we want the period to be increasing.
     # Therefore, we will flip the following values:
-    period0_flipped = period0[::-1]  # type: ignore
+    period0_flipped = period0[::-1]
     amplitude0_flipped = amplitude0[::-1]
     psd_x0_flipped = psd_x0[::-1]
 

e3sm_diags/plot/enso_diags_plot.py

@@ -261,7 +261,7 @@ def _add_colormap(
 
     if conf is not None:
         conf = _make_lon_cyclic(conf)
-        conf = conf.squeeze()  # type: ignore
+        conf = conf.squeeze()
 
         # Values in conf will be either 0 or 1. Thus, there are only two levels -
         # represented by the no-hatching and hatching levels.

e3sm_diags/viewer/enso_diags_viewer.py

@@ -1,6 +1,7 @@
 import os
 
 from e3sm_diags.logger import _setup_child_logger
+from e3sm_diags.parameter.enso_diags_parameter import EnsoDiagsParameter
 from e3sm_diags.viewer.core_viewer import OutputViewer
 
 from .default_viewer import create_metadata
@@ -21,16 +22,21 @@ def create_viewer(root_dir, parameters):
     # The name that's displayed on the viewer.
     display_name = "ENSO Diagnostics"
     set_name = "enso_diags"
+
     # The title of the colums on the webpage.
     # Appears in the second and third columns of the bolded rows.
     cols = ["Description", "Plot"]
     viewer.add_page(display_name, short_name=set_name, columns=cols)
-    param_dict: dict[str, list[str]] = {}
+    param_dict: dict[str, list[EnsoDiagsParameter]] = {}
+
     for param in parameters:
         key = param.plot_type
+
         if key not in param_dict.keys():
             param_dict[key] = []
+
         param_dict[key].append(param)
+
     for plot_type in param_dict.keys():
         # Appears in the first column of the bolded rows.
         viewer.add_group(plot_type.capitalize())