Switch to setuptools (#583)

* take one, I think we will need to tweak more becasue of files in share directory

* ok should be loading files from egg now

* try fixes from testsrunner for coverage on subprocesses with --coverage-from-repo

* just rerun linux_pmp_py3 to test coverage for now

* rerun linux_pmp_py3

* trying subprocess coverage

* correct coverage option

* removiung lina special testrunner version

* bring back all jobs

* correct job dependency

* noarch

* mved script to correct location

* fixes flake8 test and erorrs now reported on scripts (not checked before)

* travis no jobs in parallel

* new flake8 warning

* another flake8 caught on py3

* testing new testsrunner

* trying on mac

* need to tell mac to run coverall...

* typo

* pmp mdriver seems to be ok w/o subprocess

* missing file

* linux only

* seems like we need to turn autobounds off

* didn't do dirunal at this point

* flake8ed

* turn back on all machines

* removed unsed default_regions

* more flake8

* travis keeps timing out and creating troubles, removing

.circleci/config.yml

@@ -24,9 +24,9 @@ aliases:
  conda update -y -q conda
  conda config --set anaconda_upload no
  if [[ $PY_VER = "py2" ]]; then
- conda create -n $PY_VER -q -n $PY_VER $CHANNELS "python<3" $PKGS $FFMPEG
+ conda create -q -n $PY_VER $CHANNELS "python<3" $PKGS $FFMPEG
  else
- conda create -n $PY_VER -q -n $PY_VER $CHANNELS "python>3" $PKGS $FFMPEG $COVERAGE_PKGS
+ conda create -q -n $PY_VER $CHANNELS "python>3" $PKGS $FFMPEG $COVERAGE_PKGS
  fi
 
  - &setup_pmp
@@ -45,7 +45,6 @@ aliases:
  source activate $PY_VER
  python run_tests.py -H -v2 $COVERAGE
  RESULT=$?
- cd ..
  echo "*** $PY_VER test result: "${RESULT}
 
  - &run_coveralls
@@ -78,12 +77,8 @@ aliases:
  rm -rf cdp
  cp -r ../../recipes/pcmdi_metrics .
  python ./prep_for_build.py -l 1.2
- if [[ $PY_VER = 'py2' ]]; then
- conda build $PKG_NAME $CHANNELS --python=27
- else
- conda build $PKG_NAME $CHANNELS --python=36
- fi
- anaconda -t $CONDA_UPLOAD_TOKEN upload -u pcmdi -l $LABEL $CONDA_BLD_PATH/$OS/$PKG_NAME-*tar.bz2 --force
+ conda build $PKG_NAME $CHANNELS --python=36
+ anaconda -t $CONDA_UPLOAD_TOKEN upload -u pcmdi -l $LABEL $CONDA_BLD_PATH/noarch/$PKG_NAME-*tar.bz2 --force
 
 
 jobs:
@@ -101,7 +96,6 @@ jobs:
  - run: *create_conda_env
  - run: *setup_pmp
  - run: *run_pmp_tests
- - run: *conda_upload
  - store_artifacts:
  path: tests_html
  destination: tests_html
@@ -117,13 +111,15 @@ jobs:
  OS: "osx-64"
  PY_VER: "py3"
  FFMPEG: "'ffmpeg>4' 'libpng>1.6.34'"
+ COVERAGE: "-c tests/coverage.json --coverage-from-egg"
+ COVERAGE_PKGS: "coverage coveralls"
  steps:
  - checkout
  - run: *setup_miniconda
  - run: *create_conda_env
  - run: *setup_pmp
  - run: *run_pmp_tests
- - run: *conda_upload
+ - run: *run_coveralls
  - store_artifacts:
  path: tests_html
  destination: tests_html
@@ -145,7 +141,6 @@ jobs:
  - run: *create_conda_env
  - run: *setup_pmp
  - run: *run_pmp_tests
- - run: *conda_upload
  - store_artifacts:
  path: tests_html
  destination: tests_html
@@ -161,7 +156,7 @@ jobs:
  OS: "linux-64"
  PY_VER: "py3"
  FFMPEG: "ffmpeg"
- COVERAGE: "-c tests/coverage.json"
+ COVERAGE: "-c tests/coverage.json --coverage-from-egg"
  COVERAGE_PKGS: "coverage coveralls"
  steps:
  - checkout
@@ -178,6 +173,7 @@ jobs:
  path: tests_png
  destination: tests_png
 
+
 workflows:
  version: 2
  pcmdi_metrics:

src/python/diurnal/scripts/savg_fourierWrappedInOut.py → pcmdi_metrics/diurnal/scripts/savg_fourierWrappedInOut.py

@@ -19,11 +19,11 @@
 import cdutil
 import MV2
 import os
-import sys
 import glob
 import pcmdi_metrics
 import collections
 import json
+import pkg_resources
 from pcmdi_metrics.diurnal.common import monthname_d, P, populateStringConstructor
 
 
@@ -218,11 +218,10 @@ 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")
 disclaimer = open(
  os.path.join(
- sys.prefix,
- "share",
- "pmp",
+ egg_pth,
  "disclaimer.txt")).read()
 metrics_dictionary["DISCLAIMER"] = disclaimer
 metrics_dictionary["REFERENCE"] = "The statistics in this file are based on Covey et al., J Climate 2016"

src/python/diurnal/scripts/std_of_dailymeansWrappedInOut.py → pcmdi_metrics/diurnal/scripts/std_of_dailymeansWrappedInOut.py

@@ -25,8 +25,8 @@
 import pcmdi_metrics
 import collections
 import glob
-import sys
 import json
+import pkg_resources
 
 from pcmdi_metrics.diurnal.common import monthname_d, P, populateStringConstructor, INPUT
 import cdp
@@ -116,11 +116,10 @@ def compute(param):
  os.path.abspath(
  args.results_dir),
  jsonFile())
+egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
 disclaimer = open(
  os.path.join(
- sys.prefix,
- "share",
- "pmp",
+ egg_pth,
  "disclaimer.txt")).read()
 metrics_dictionary["DISCLAIMER"] = disclaimer
 metrics_dictionary["REFERENCE"] = "The statistics in this file are based on Trenberth, Zhang & Gehne, J Hydromet. 2017"

src/python/diurnal/scripts/std_of_hourlyvaluesWrappedInOut.py → pcmdi_metrics/diurnal/scripts/std_of_hourlyvaluesWrappedInOut.py

@@ -22,9 +22,9 @@
 import pcmdi_metrics
 import collections
 import glob
-import sys
 import cdp
 import json
+import pkg_resources
 from pcmdi_metrics.diurnal.common import monthname_d, P, populateStringConstructor, INPUT
 
 
@@ -126,12 +126,10 @@ def compute(param):
  os.path.abspath(
  args.results_dir),
  jsonFile())
-
+egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
 disclaimer = open(
  os.path.join(
- sys.prefix,
- "share",
- "pmp",
+ egg_pth,
  "disclaimer.txt")).read()
 metrics_dictionary["DISCLAIMER"] = disclaimer
 metrics_dictionary["REFERENCE"] = "The statistics in this file are based on Trenberth, Zhang & Gehne, J Hydromet. 2017"

src/python/diurnal/scripts/std_of_meandiurnalcycWrappedInOut.py → pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycWrappedInOut.py

@@ -19,10 +19,10 @@
 import pcmdi_metrics
 import collections
 import glob
-import sys
 import genutil
 import json
 import cdp
+import pkg_resources
 from pcmdi_metrics.diurnal.common import monthname_d, P, populateStringConstructor, INPUT
 
 
@@ -128,11 +128,10 @@ def compute(param):
  os.path.abspath(
  args.results_dir),
  jsonFile())
+egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
 disclaimer = open(
  os.path.join(
- sys.prefix,
- "share",
- "pmp",
+ egg_pth,
  "disclaimer.txt")).read()
 metrics_dictionary["DISCLAIMER"] = disclaimer
 metrics_dictionary["REFERENCE"] = "The statistics in this file are based on Trenberth, Zhang & Gehne, J Hydromet. 2017"

src/python/pcmdi/scripts/driver/dataset.py → pcmdi_metrics/driver/dataset.py

@@ -4,6 +4,7 @@
 import logging
 import cdutil
 import cdms2
+import pkg_resources
 from pcmdi_metrics.io.base import Base
 from six import with_metaclass
 
@@ -117,7 +118,8 @@ def get(self):
  @staticmethod
  def load_path_as_file_obj(name):
  ''' Returns a File object for the file named name. '''
- file_path = sys.prefix + '/share/pmp/' + name
+ egg_pth = pkg_resources.resource_filename(pkg_resources.Requirement.parse("pcmdi_metrics"), "share/pmp")
+ file_path = os.path.join(egg_pth, name)
  opened_file = None
  try:
  opened_file = open(file_path)

src/python/pcmdi/scripts/driver/outputmetrics.py → pcmdi_metrics/driver/outputmetrics.py

@@ -116,7 +116,7 @@ def calculate_and_output_metrics(self, ref, test):
 
  try:
  test_data = test()
- except RuntimeError as e:
+ except RuntimeError:
  # THIS EXCEPTION IS RAISED TO BREAK OUT OF THE FOR LOOP IN PCMDI_DRIVER
  # THIS SHOULD BE A CUSTOM EXCEPTION (PrematureBreakError)
  raise RuntimeError('Need to skip model: %s' % test.obs_or_model)

src/python/io/base.py → pcmdi_metrics/io/base.py

@@ -531,9 +531,12 @@ def getAxisList(self):
  for a in self.json_struct:
  values.append(set())
  self.get_axes_values_recursive(0, len(self.json_struct) - 1, self.data, values)
+ autoBounds = cdms2.getAutoBounds()
+ cdms2.setAutoBounds("off")
  for i, nm in enumerate(self.json_struct):
  axes.append(cdms2.createAxis(sorted(list(values[i])), id=nm))
  self.axes = axes
+ cdms2.setAutoBounds(autoBounds)
  return self.axes
 
  def __call__(self, **kargs):

pcmdi_metrics/monsoon_wang/__init__.py

@@ -0,0 +1,2 @@
+from .monsoon_precip_index_fncs import mpd, mpi_skill_scores # noqa
+from .monsoon_wang_driver import create_monsoon_wang_parser, monsoon_wang_runner # noqa