Merge pull request #905 from PCMDI/technical_patch

bug fix
PCMDI · Feb 24, 2023 · 3e2b1d7 · 3e2b1d7
2 parents 5f26713 + 3bc7322
commit 3e2b1d7
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 15 deletions.
diff --git a/pcmdi_metrics/diurnal/common.py b/pcmdi_metrics/diurnal/common.py
@@ -1,6 +1,6 @@
 import genutil
 
-from pcmdi_metrics.driver.pmp_parser import PMPParser
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 
 monthname_d = {
     1: "Jan",

diff --git a/pcmdi_metrics/enso/lib/enso_lib.py b/pcmdi_metrics/enso/lib/enso_lib.py
@@ -9,7 +9,7 @@
 from collections import defaultdict
 
 import pcmdi_metrics
-from pcmdi_metrics.driver.pmp_parser import PMPParser
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 
 
 def AddParserArgument():

diff --git a/pcmdi_metrics/misc/scripts/get_pmp_data.py b/pcmdi_metrics/misc/scripts/get_pmp_data.py
@@ -7,7 +7,7 @@
 import cdat_info
 import requests
 
-from pcmdi_metrics.driver.pmp_parser import PMPParser
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 
 
 def download_file(download_url_root, name, local_filename):

diff --git a/pcmdi_metrics/misc/scripts/parallelize_driver.py b/pcmdi_metrics/misc/scripts/parallelize_driver.py
@@ -14,7 +14,7 @@
 
 import cdp
 
-from pcmdi_metrics.driver.pmp_parser import PMPParser
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 
 parser = PMPParser(description="Parallelize a driver over some arguments")
 parser.add_argument("--driver", help="driver to prallelize")

diff --git a/pcmdi_metrics/mjo/scripts/parallel_driver.py b/pcmdi_metrics/mjo/scripts/parallel_driver.py
@@ -9,14 +9,15 @@
 from genutil import StringConstructor
 
 import pcmdi_metrics
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 from pcmdi_metrics.misc.scripts import parallel_submitter
 from pcmdi_metrics.mjo.lib import AddParserArgument
 from pcmdi_metrics.variability_mode.lib import sort_human
 
 # =================================================
 # Collect user defined options
 # -------------------------------------------------
-P = pcmdi_metrics.driver.pmp_parser.PMPParser(
+P = PMPParser(
     description="Runs PCMDI Modes of MJO Computations",
     formatter_class=RawTextHelpFormatter,
 )

diff --git a/pcmdi_metrics/monsoon_wang/monsoon_wang_driver.py b/pcmdi_metrics/monsoon_wang/monsoon_wang_driver.py
@@ -11,7 +11,7 @@
 import pcmdi_metrics
 from pcmdi_metrics import resources
 from pcmdi_metrics.monsoon_wang import mpd, mpi_skill_scores
-from pcmdi_metrics.pcmdi.pmp_parser import PMPParser
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 
 
 def create_monsoon_wang_parser():

diff --git a/pcmdi_metrics/precip_distribution/precip_distribution_driver.py b/pcmdi_metrics/precip_distribution/precip_distribution_driver.py
@@ -8,7 +8,7 @@
 import MV2 as MV
 from genutil import StringConstructor
 
-from pcmdi_metrics.driver.pmp_parser import PMPParser
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 from pcmdi_metrics.precip_distribution.lib import (
     AddParserArgument,
     Regrid,

diff --git a/pcmdi_metrics/precip_distribution/scripts_pcmdi/parallel_driver_cmip.py b/pcmdi_metrics/precip_distribution/scripts_pcmdi/parallel_driver_cmip.py
@@ -1,7 +1,7 @@
 import glob
 import os
 
-from pcmdi_metrics.driver.pmp_parser import PMPParser
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 from pcmdi_metrics.misc.scripts import parallel_submitter
 from pcmdi_metrics.precip_distribution.lib import AddParserArgument
 

diff --git a/pcmdi_metrics/precip_variability/scripts_pcmdi/calc_ratio.py b/pcmdi_metrics/precip_variability/scripts_pcmdi/calc_ratio.py
@@ -3,7 +3,7 @@
 import json
 import os
 
-from pcmdi_metrics.driver.pmp_parser import PMPParser
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 from pcmdi_metrics.precip_variability.lib import AddParserArgument
 
 # Read parameters

diff --git a/pcmdi_metrics/precip_variability/scripts_pcmdi/parallel_driver_cmip.py b/pcmdi_metrics/precip_variability/scripts_pcmdi/parallel_driver_cmip.py
@@ -2,7 +2,7 @@
 import glob
 import xsearch as xs
 
-from pcmdi_metrics.driver.pmp_parser import PMPParser
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 from pcmdi_metrics.misc.scripts import parallel_submitter
 from pcmdi_metrics.precip_variability.lib import AddParserArgument
 

diff --git a/pcmdi_metrics/variability_mode/scripts_pcmdi/parallel_driver.py b/pcmdi_metrics/variability_mode/scripts_pcmdi/parallel_driver.py
@@ -9,6 +9,7 @@
 from genutil import StringConstructor
 
 import pcmdi_metrics
+from pcmdi_metrics.mean_climate.lib.pmp_parser import PMPParser
 from pcmdi_metrics.misc.scripts import parallel_submitter
 from pcmdi_metrics.variability_mode.lib import (
     AddParserArgument,
@@ -19,7 +20,7 @@
 # =================================================
 # Collect user defined options
 # -------------------------------------------------
-P = pcmdi_metrics.driver.pmp_parser.PMPParser(
+P = PMPParser(
     description="Runs PCMDI Modes of Variability Computations",
     formatter_class=RawTextHelpFormatter,
 )

diff --git a/pcmdi_metrics/version.py b/pcmdi_metrics/version.py
@@ -1,3 +1,3 @@
-__version__ = 'v2.4.0'
-__git_tag_describe__ = 'v2.4.0-82-g9c912c4'
-__git_sha1__ = '9c912c49f5839ecdfde48da5b635220cb08a2665'
+__version__ = 'v3.0.1'
+__git_tag_describe__ = 'v3.0.1'
+__git_sha1__ = '5f26713a589f99e30f3ee36655f6c1311fc724b8'
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 else:
     install_dev = False
 
-release_version = "2.5.1"
+release_version = "3.0.1"
 
 p = subprocess.Popen(
     ("git", "describe", "--tags"),