Fix black and isort conflict

E3SM-Project · Dec 4, 2023 · 2808fb1 · 2808fb1
1 parent 49375c8
commit 2808fb1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/e3sm_diags/driver/zonal_mean_xy_driver.py b/e3sm_diags/driver/zonal_mean_xy_driver.py
@@ -5,8 +5,6 @@
 import xarray as xr
 
 from e3sm_diags.driver.utils.dataset_xr import Dataset
-
-# from e3sm_diags.driver.utils.io import _save_data_metrics_and_plots
 from e3sm_diags.driver.utils.regrid import (
     get_z_axis,
     has_z_axis,
@@ -16,6 +14,7 @@
 from e3sm_diags.logger import custom_logger
 
 # TODO
+# from e3sm_diags.driver.utils.io import _save_data_metrics_and_plots
 # from e3sm_diags.plot.lat_lon_plot import plot as plot_func
 
 logger = custom_logger(__name__)
@@ -137,11 +136,8 @@ def _run_diags_2d(
     """
     for region in regions:
         parameter._set_param_output_attrs(var_key, season, region, ref_name, ilev=None)
-
-        (
-            ds_test_1d,
-            ds_ref_1d,
-        ) = _calculate_zonal_mean(
+        # TODO: Fix type annotation
+        ds_test_1d, ds_ref_1d = _calculate_zonal_mean(  # type: ignore
             parameter,
             ds_test,
             ds_ref,
@@ -206,10 +202,8 @@ def _run_diags_3d(
         ds_ref_ilev = ds_ref_rg.sel({z_axis_key: ilev})
 
         for region in regions:
-            (
-                ds_test_1d,
-                ds_ref_1d,
-            ) = _calculate_zonal_mean(
+            # TODO: Fix type annotation
+            ds_test_1d, ds_ref_1d = _calculate_zonal_mean(  # type: ignore
                 parameter,
                 ds_test_ilev,
                 ds_ref_ilev,
@@ -278,9 +272,10 @@ def _calculate_zonal_mean(
         ds_ref_1d = zonal_avg(ds_ref, var_key)
     else:
         ds_test_1d = zonal_avg(ds_test, var_key)
-        ds_ref_1d = None  # type: ignore
+        ds_ref_1d = None
 
-    return ds_test_1d, ds_ref_1d
+    # TODO: Fix type annotation
+    return ds_test_1d, ds_ref_1d  # type: ignore
 
 
 def zonal_avg(

diff --git a/e3sm_diags/parameter/core_parameter.py b/e3sm_diags/parameter/core_parameter.py
@@ -13,10 +13,6 @@
 logger = custom_logger(__name__)
 
 
-if TYPE_CHECKING:
-    from e3sm_diags.driver.utils.dataset_xr import Dataset
-
-
 if TYPE_CHECKING:
     from e3sm_diags.driver.utils.dataset_xr import Dataset