pre-commit fixes

kristinchang3 · kristinchang3 · commit 4e94fcfef5ee · 2025-10-29T15:13:51.000-07:00
diff --git a/pcmdi_metrics/diurnal/scripts/compositeDiurnalStatistics.py b/pcmdi_metrics/diurnal/scripts/compositeDiurnalStatistics.py
@@ -24,7 +24,6 @@
 import multiprocessing as mp
 import os
 
-from pcmdi_metrics.utils import cdp_run
 import cftime
 import numpy as np
 import xarray as xr
@@ -44,6 +43,7 @@
     get_time_key,
     xcdat_open,
 )
+from pcmdi_metrics.utils import cdp_run
 
 
 def main():
diff --git a/pcmdi_metrics/diurnal/scripts/computeStdOfDailyMeans.py b/pcmdi_metrics/diurnal/scripts/computeStdOfDailyMeans.py
@@ -16,7 +16,6 @@
 import multiprocessing as mp
 import os
 
-from pcmdi_metrics.utils import cdp_run
 import cftime
 import xarray as xr
 
@@ -32,6 +31,7 @@
     get_longitude_key,
     xcdat_open,
 )
+from pcmdi_metrics.utils import cdp_run
 
 
 def main():
diff --git a/pcmdi_metrics/diurnal/scripts/std_of_dailymeans.py b/pcmdi_metrics/diurnal/scripts/std_of_dailymeans.py
@@ -24,7 +24,6 @@
 import multiprocessing as mp
 import os
 
-from pcmdi_metrics.utils import cdp_run
 import numpy as np
 
 import pcmdi_metrics
@@ -41,6 +40,7 @@
     get_time_key,
     xcdat_open,
 )
+from pcmdi_metrics.utils import cdp_run
 
 
 def main():
diff --git a/pcmdi_metrics/diurnal/scripts/std_of_hourlyvalues.py b/pcmdi_metrics/diurnal/scripts/std_of_hourlyvalues.py
@@ -21,8 +21,6 @@
 import multiprocessing as mp
 import os
 
-from pcmdi_metrics.utils import cdp_run
-
 import pcmdi_metrics
 from pcmdi_metrics import resources
 from pcmdi_metrics.diurnal import compute_area_weighted_rms
@@ -33,6 +31,7 @@
     populateStringConstructor,
 )
 from pcmdi_metrics.io import get_latitude_key, get_longitude_key, xcdat_open
+from pcmdi_metrics.utils import cdp_run
 
 
 def main():
diff --git a/pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycle.py b/pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycle.py
@@ -19,8 +19,6 @@
 import multiprocessing as mp
 import os
 
-from pcmdi_metrics.utils import cdp_run
-
 import pcmdi_metrics
 from pcmdi_metrics import resources
 from pcmdi_metrics.diurnal import compute_area_weighted_rms
@@ -36,6 +34,7 @@
     get_time_key,
     xcdat_open,
 )
+from pcmdi_metrics.utils import cdp_run
 
 
 def main():
diff --git a/pcmdi_metrics/io/__init__.py b/pcmdi_metrics/io/__init__.py
@@ -2,7 +2,7 @@
 from .xcdat_openxml import xcdat_open  # noqa  # isort:skip
 from .string_constructor import StringConstructor, fill_template  # noqa  # isort:skip
 from . import base  # noqa
-from . import cdp_io # noqa
+from . import cdp_io  # noqa
 
 from .xcdat_dataset_io import (  # noqa  # isort:skip
     da_to_ds,
diff --git a/pcmdi_metrics/io/base.py b/pcmdi_metrics/io/base.py
@@ -16,7 +16,7 @@
 
 import pcmdi_metrics
 from pcmdi_metrics import LOG_LEVEL
-from pcmdi_metrics.io import cdp_io, StringConstructor
+from pcmdi_metrics.io import StringConstructor, cdp_io
 
 logging.getLogger("pcmdi_metrics").setLevel(LOG_LEVEL)  # set up to log errors
 
diff --git a/pcmdi_metrics/io/cdp_io.py b/pcmdi_metrics/io/cdp_io.py
@@ -1,6 +1,7 @@
 from __future__ import print_function
 
 import abc
+
 from six import with_metaclass
 
 
@@ -13,4 +14,4 @@ def read(self):
     @abc.abstractmethod
     def write(self):
         """Write a file."""
-        raise NotImplementedError()
+        raise NotImplementedError()
diff --git a/pcmdi_metrics/mjo/mjo_metrics_driver.py b/pcmdi_metrics/mjo/mjo_metrics_driver.py
@@ -42,14 +42,13 @@
 from shutil import copyfile
 
 import pcmdi_metrics
-from pcmdi_metrics.utils import pmp_parser
 from pcmdi_metrics.mjo.lib import (
     AddParserArgument,
     YearCheck,
     mjo_metric_ewr_calculation,
     mjo_metrics_to_json,
 )
-from pcmdi_metrics.utils import fill_template, tree
+from pcmdi_metrics.utils import fill_template, pmp_parser, tree
 
 # Must be done before any CDAT library is called.
 # https://github.com/CDAT/cdat/issues/2213
diff --git a/pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py b/pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py
@@ -54,7 +54,6 @@
 
 from pcmdi_metrics.io import load_regions_specs, region_subset, xcdat_open
 from pcmdi_metrics.io.base import Base
-from pcmdi_metrics.utils import pmp_parser
 from pcmdi_metrics.monsoon_sperber.lib import (
     AddParserArgument,
     YearCheck,
@@ -64,7 +63,7 @@
     sperber_metrics,
     tree,
 )
-from pcmdi_metrics.utils import create_land_sea_mask, fill_template
+from pcmdi_metrics.utils import create_land_sea_mask, fill_template, pmp_parser
 
 # How many elements each list should have
 n = 5  # pentad
diff --git a/pcmdi_metrics/precip_distribution/precip_distribution_driver.py b/pcmdi_metrics/precip_distribution/precip_distribution_driver.py
@@ -7,13 +7,13 @@
 import xarray as xr
 
 from pcmdi_metrics.io import StringConstructor, get_calendar, xcdat_open
-from pcmdi_metrics.utils.pmp_parser import PMPParser
 from pcmdi_metrics.precip_distribution.lib import (
     AddParserArgument,
     Regrid_xr,
     precip_distribution_cum,
     precip_distribution_frq_amt,
 )
+from pcmdi_metrics.utils.pmp_parser import PMPParser
 
 # Read parameters
 P = PMPParser()
diff --git a/pcmdi_metrics/precip_variability/variability_across_timescales_PS_driver.py b/pcmdi_metrics/precip_variability/variability_across_timescales_PS_driver.py
@@ -2,11 +2,11 @@
 import glob
 import os
 
-from pcmdi_metrics.utils.pmp_parser import PMPParser
 from pcmdi_metrics.precip_variability.lib import (
     AddParserArgument,
     precip_variability_across_timescale,
 )
+from pcmdi_metrics.utils.pmp_parser import PMPParser
 
 # Read parameters
 P = PMPParser()
diff --git a/pcmdi_metrics/utils/__init__.py b/pcmdi_metrics/utils/__init__.py
@@ -1,4 +1,6 @@
 from .adjust_units import adjust_units, fix_tuple
+from .cdp_parameter import CDPParameter
+from .cdp_parser import CDPParser
 from .custom_season import (
     custom_season_average,
     custom_season_departure,
@@ -21,6 +23,8 @@
     regrid,
 )
 from .land_sea_mask import apply_landmask, apply_oceanmask, create_land_sea_mask
+from .pmp_parameter import PMPMetricsParameter, PMPParameter
+from .pmp_parser import PMPMetricsParser, PMPParser
 from .qc import (
     check_daily_time_axis,
     check_monthly_time_axis,
@@ -31,7 +35,3 @@
 from .string_constructor import StringConstructor, fill_template
 from .tree_dict import tree
 from .xr_to_cdms2 import cdms2_to_xarray, xarray_to_cdms2
-from .cdp_parser import CDPParser
-from .cdp_parameter import CDPParameter
-from .pmp_parser import PMPParser, PMPMetricsParser
-from .pmp_parameter import PMPParameter, PMPMetricsParameter
diff --git a/pcmdi_metrics/utils/cdp_parameter.py b/pcmdi_metrics/utils/cdp_parameter.py
@@ -1,12 +1,10 @@
 from __future__ import print_function
 
-import abc
+import copy
 import importlib
-import sys
 import os
-import copy
+import sys
 import types
-from six import with_metaclass
 
 
 class CDPParameter(object):
@@ -16,16 +14,17 @@ def __add__(self, other):
         """
         # First make a deepcopy of the current object.
         duplicate = copy.deepcopy(self)
-        
+
         for attr in dir(other):
             # Ignore any of the hidden attributes.
-            if attr.startswith('_') or \
-                isinstance(getattr(other, attr), types.MethodType):
+            if attr.startswith("_") or isinstance(
+                getattr(other, attr), types.MethodType
+            ):
                 continue
 
             val = copy.deepcopy(getattr(other, attr))
             setattr(duplicate, attr, val)
-        
+
         return duplicate
 
     def check_values(self):
@@ -39,31 +38,32 @@ def load_parameter_from_py(self, parameter_file_path):
         """
         Initialize a parameter object from a Python script.
         """
-        parameter_as_module = \
-            self.import_user_parameter_file_as_module(parameter_file_path)
+        parameter_as_module = self.import_user_parameter_file_as_module(
+            parameter_file_path
+        )
         self.load_parameters_from_module(parameter_as_module)
 
     def import_user_parameter_file_as_module(self, parameter_file_path):
         if not os.path.isfile(parameter_file_path):
-            raise IOError('Parameter file %s not found.' % parameter_file_path)
+            raise IOError("Parameter file %s not found." % parameter_file_path)
 
         path_to_module = os.path.split(parameter_file_path)[0]
         module_name = os.path.split(parameter_file_path)[1]
-        if module_name.count('.') > 1:
+        if module_name.count(".") > 1:
             raise ValueError("Filename cannot contain '.' outside extension.")
-        if '.' in module_name:
-            module_name = module_name.split('.')[0]
+        if "." in module_name:
+            module_name = module_name.split(".")[0]
 
         sys.path.insert(0, path_to_module)
         return importlib.import_module(module_name)
 
     def load_parameters_from_module(self, parameter_as_module):
         user_defined_parameters = []
         for user_parameter in dir(parameter_as_module):
-            if not user_parameter.startswith('__'):
+            if not user_parameter.startswith("__"):
                 user_defined_parameters.append(user_parameter)
 
         # Initialize the variables in this parameter, so the driver can
         # access them as if they were defined regularly.
         for p in user_defined_parameters:
-            self.__dict__[p] = getattr(parameter_as_module, p)
+            self.__dict__[p] = getattr(parameter_as_module, p)
diff --git a/pcmdi_metrics/utils/cdp_parser.py b/pcmdi_metrics/utils/cdp_parser.py
diff --git a/pcmdi_metrics/utils/cdp_run.py b/pcmdi_metrics/utils/cdp_run.py
diff --git a/pcmdi_metrics/utils/pmp_parameter.py b/pcmdi_metrics/utils/pmp_parameter.py
diff --git a/pcmdi_metrics/utils/pmp_parser.py b/pcmdi_metrics/utils/pmp_parser.py
diff --git a/pcmdi_metrics/variability_mode/variability_modes_driver.py b/pcmdi_metrics/variability_mode/variability_modes_driver.py
