should fix nightly (#598)

PCMDI · Apr 8, 2019 · 7a18cbd · 7a18cbd
1 parent 8e149e0
commit 7a18cbd
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 10 deletions.
diff --git a/pcmdi_metrics/diurnal/scripts/savg_fourierWrappedInOut.py b/pcmdi_metrics/diurnal/scripts/savg_fourierWrappedInOut.py
@@ -218,7 +218,11 @@ def spacevavg(tvarb1, tvarb2, sftlf, model):
  os.path.abspath(
  args.results_dir),
  os.path.basename(jsonname))
-egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+try:
+ egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+except Exception:
+ # python 2 seems to fail when ran in home directory of source?
+ egg_pth = os.path.join(os.getcwd(), "share", "pmp")
 disclaimer = open(
  os.path.join(
  egg_pth,

diff --git a/pcmdi_metrics/diurnal/scripts/std_of_dailymeansWrappedInOut.py b/pcmdi_metrics/diurnal/scripts/std_of_dailymeansWrappedInOut.py
@@ -116,7 +116,11 @@ def compute(param):
  os.path.abspath(
  args.results_dir),
  jsonFile())
-egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+try:
+ egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+except Exception:
+ # python 2 seems to fail when ran in home directory of source?
+ egg_pth = os.path.join(os.getcwd(), "share", "pmp")
 disclaimer = open(
  os.path.join(
  egg_pth,

diff --git a/pcmdi_metrics/diurnal/scripts/std_of_hourlyvaluesWrappedInOut.py b/pcmdi_metrics/diurnal/scripts/std_of_hourlyvaluesWrappedInOut.py
@@ -126,7 +126,11 @@ def compute(param):
  os.path.abspath(
  args.results_dir),
  jsonFile())
-egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+try:
+ egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+except Exception:
+ # python 2 seems to fail when ran in home directory of source?
+ egg_pth = os.path.join(os.getcwd(), "share", "pmp")
 disclaimer = open(
  os.path.join(
  egg_pth,

diff --git a/pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycWrappedInOut.py b/pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycWrappedInOut.py
@@ -128,7 +128,11 @@ def compute(param):
  os.path.abspath(
  args.results_dir),
  jsonFile())
-egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+try:
+ egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+except Exception:
+ # python 2 seems to fail when ran in home directory of source?
+ egg_pth = os.path.join(os.getcwd(), "share", "pmp")
 disclaimer = open(
  os.path.join(
  egg_pth,

diff --git a/pcmdi_metrics/driver/dataset.py b/pcmdi_metrics/driver/dataset.py
@@ -118,7 +118,11 @@ def get(self):
  @staticmethod
  def load_path_as_file_obj(name):
  ''' Returns a File object for the file named name. '''
- egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+ try:
+ egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+ except Exception:
+ # python 2 seems to fail when ran in home directory of source?
+ egg_pth = os.path.join(os.getcwd(), "share", "pmp")
  file_path = os.path.join(egg_pth, name)
  opened_file = None
  try:

diff --git a/pcmdi_metrics/monsoon_wang/monsoon_wang_driver.py b/pcmdi_metrics/monsoon_wang/monsoon_wang_driver.py
@@ -220,8 +220,12 @@ def monsoon_wang_runner(args):
 
  #########################################
 
- egg_pth = pkg_resources.resource_filename(
- pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+ try:
+ egg_pth = pkg_resources.resource_filename(
+ pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+ except Exception:
+ # python 2 seems to fail when ran in home directory of source?
+ egg_pth = os.path.join(os.getcwd(), "share", "pmp")
  globals = {}
  locals = {}
  exec(compile(open(os.path.join(egg_pth, "default_regions.py")).read(),

diff --git a/share/pmp/default_regions.py b/share/pmp/default_regions.py
@@ -0,0 +1 @@
+../default_regions.py
diff --git a/share/pmp/disclaimer.txt b/share/pmp/disclaimer.txt
@@ -0,0 +1 @@
+../disclaimer.txt
diff --git a/share/pmp/graphics/png b/share/pmp/graphics/png
@@ -0,0 +1 @@
+../../pcmdi
diff --git a/share/pmp/graphics/vcs b/share/pmp/graphics/vcs
@@ -0,0 +1 @@
+../../../pcmdi_metrics/graphics/share
diff --git a/share/pmp/obs_info_dictionary.json b/share/pmp/obs_info_dictionary.json
@@ -0,0 +1 @@
+../../doc/obs_info_dictionary.json
diff --git a/tests/test_pmp_portrait_values_on.py b/tests/test_pmp_portrait_values_on.py
@@ -9,7 +9,11 @@
 import vcs
 import sys
 import pkg_resources
-egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+try:
+ egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+except Exception:
+ # python 2 seems to fail when ran in home directory of source?
+ egg_pth = os.path.join(os.getcwd(), "share", "pmp")
 
 class TestPortraits(basepmpgraphics.TestGraphics):
  def __init__(self,*args,**kargs):

diff --git a/tests/test_pmp_portraits.py b/tests/test_pmp_portraits.py
@@ -10,8 +10,11 @@
 import sys
 import pkg_resources
 one = pkg_resources.Requirement.parse("pcmdi_metrics")
-print("ONE:",one)
-egg_pth = pkg_resources.resource_filename(one, "share/pmp")
+try:
+ egg_pth = pkg_resources.resource_filename(one, "share/pmp")
+except Exception:
+ # python 2 seems to fail when ran in home directory of source?
+ egg_pth = os.path.join(os.getcwd(), "share", "pmp")
 
 class TestPortraits(basepmpgraphics.TestGraphics):
  def __init__(self,*args,**kargs):