fix #238 for @lee1043 based on @durack1 recommendation to not load it… (

#244)

* fix #238 for @lee1043 based on @durack1 recommendation to not load it a start time but only on demand

* flake8

* with new cdtime, better compare correctly

* spaces...

* moved ci-support in its own dir

only 1 test at a time longer but easier to see output

* ok numpy 13 needed a tweak here for minmax

* Flake8

* circleci stuck with older vtk

.travis.yml

@@ -22,6 +22,6 @@ script:
 - git clone git://github.com/uv-cdat/uvcdat-testdata
 - cd uvcdat-testdata ; git checkout $TRAVIS_BRANCH ; cd ..
 - df -h
-- python run_tests.py -n 2 -v2 -g --no-vtk-ui
+- python run_tests.py -n 1 -v2 -g --no-vtk-ui
 after_success:
-    - if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then conda install conda-build && conda install anaconda-client && bash scripts/conda_upload.sh ; fi
+    - if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then conda install conda-build && conda install anaconda-client && bash ci-support/conda_upload.sh ; fi

scripts/circleci_mac.sh → ci-support/circleci_mac.sh

@@ -2,10 +2,10 @@ export UVCDAT_ANONYMOUS_LOG=False
 export PATH=${HOME}/miniconda/bin:${PATH}
 #export VCS_BACKGROUND=0  # circleci seg faults on bg=1
 #python run_tests.py -v2 -g -H -p  # -H and -p for collection by artifacts
-python run_tests.py -n 2 -v2 -g --no-vtk-ui
+python run_tests.py -n 1 -v2 -g --no-vtk-ui
 RESULT=$?
 echo "test command exit result:",$RESULT
 if [ $RESULT -eq 0 -a $CIRCLE_BRANCH == "master" ]; then conda install conda-build anaconda-client ; fi
-if [ $RESULT -eq 0 -a $CIRCLE_BRANCH == "master" ]; then bash ./scripts/conda_upload.sh ; fi
+if [ $RESULT -eq 0 -a $CIRCLE_BRANCH == "master" ]; then bash ./ci-support/conda_upload.sh ; fi
 exit $RESULT
 

ci-support/circleci_mac_dep.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+ls
+pwd
+export PATH=${HOME}/miniconda/bin:${PATH}
+conda install -c uvcdat/label/nightly -c conda-forge -c uvcdat vtk-cdat cdutil genutil dv3d mesalib nose image-compare flake8 matplotlib
+export UVCDAT_ANONYMOUS_LOG=False
+python setup.py install --old-and-unmanageable

circle.yml

@@ -10,7 +10,7 @@ general:
 
 checkout:
   post:
-    - ./scripts/checkout_merge_commit.sh
+    - ./ci-support/checkout_merge_commit.sh
 
 #machine:
 machine:
@@ -20,17 +20,17 @@ machine:
         - sudo -H pip install --upgrade virtualenv
         - ls
         - pwd
-        - bash vcs/scripts/circleci_mac_machine_pre.sh
+        - bash vcs/ci-support/circleci_mac_machine_pre.sh
     #services:
     #    - docker
 
 dependencies:
     override:
-        - bash ./scripts/circleci_mac_dep.sh
+        - bash ./ci-support/circleci_mac_dep.sh
           #   - docker pull cdat/conda:conda-forge-cdms2
 
 
 test:
   override:
-      - bash ./scripts/circleci_mac.sh
-        # - docker run -it -v `pwd`:/git_repo -a STDOUT -a STDERR -P cdat/conda:conda-forge-cdms2 /git_repo/scripts/circle.sh
+      - bash ./ci-support/circleci_mac.sh
+        # - docker run -it -v `pwd`:/git_repo -a STDOUT -a STDERR -P cdat/conda:conda-forge-cdms2 /git_repo/ci-support/circle.sh

tests/test_vcs_load_mpl_cmaps.py

@@ -0,0 +1,9 @@
+import unittest
+import vcs
+class VCSMPLCmaps(unittest.TestCase):
+    def testLoadMPLCmaps(self):
+        import vcs
+        original = vcs.listelements("colormap")
+        vcs.utils.loadmatplotlibcolormaps()
+        mpl = vcs.listelements("colormap")
+        self.assertGreater(len(mpl),len(original))

tests/test_vcs_queries.py

@@ -3,7 +3,7 @@
 
 class TestVCSQueries(unittest.TestCase):
     def testVCSQueries(self):
-        gms = ["boxfill","isofill","isoline","meshfill","scatter","yxvsx","xvsy","xyvsy","vector"]
+        gms = ["boxfill","isofill","isoline","meshfill","scatter","yxvsx","xvsy","xyvsy","vector","streamline"]
         for gm in gms:
           print "testing query work for:",gm
           exec("g=vcs.create%s()" % gm)

vcs/VCS_validation_functions.py

@@ -1256,7 +1256,7 @@ def checkTimeUnits(self, name, value):
         checkedRaise(self, value, ValueError, value + ' is invalid time units')
     sp = value.split('since')[1]
     b = cdtime.s2c(sp)
-    if b == cdtime.comptime(0, 1):
+    if b.cmp(cdtime.comptime(0, 1)) == 0:
         checkedRaise(self, value, ValueError, sp + ' is invalid date')
     return value
 
@@ -1267,10 +1267,10 @@ def checkDatawc(self, name, value):
         value = float(value), 0
     elif isinstance(value, str):
         t = cdtime.s2c(value)
-        if t != cdtime.comptime(0, 1):
+        if t.cmp(cdtime.comptime(0, 1)) != 0:
             t = t.torel(self.datawc_timeunits, self.datawc_calendar)
             value = float(t.value), 1
-        else:
+        else:  # Bad string led to 0-1-1
             checkedRaise(
                 self,
                 value,

vcs/colors.py

@@ -42,3 +42,13 @@ def matplotlib2vcs(cmap, vcs_name=None):
         vcs_cmap.setcolorcell(i, *([int(x * 100) for x in cmap_rgbs[i][:4]]))
 
     return vcs_cmap
+
+
+def loadmatplotlibcolormaps():
+    """
+    Convert all matplotlib colormaps to vcs colormaps
+    """
+    import matplotlib.pyplot as plt
+    mpl_cmaps = sorted(m for m in plt.cm.datad if not m.endswith("_r"))
+    for cmap in mpl_cmaps:
+        matplotlib2vcs(cmap)

vcs/utils.py

@@ -45,7 +45,7 @@
     hasVCSAddons = False
 
 
-from colors import rgb2str, str2rgb, matplotlib2vcs  # noqa
+from colors import rgb2str, str2rgb, matplotlib2vcs, loadmatplotlibcolormaps  # noqa
 
 indent = 1
 sort_keys = True
@@ -1148,6 +1148,8 @@ def myfunction(d, mx, mn):
         if d is None:
             return mx, mn
         from numpy.ma import maximum, minimum, count
+        if isinstance(d, (int, float)):
+            return maximum(d, mx), minimum(d, mn)
         try:
             if count(d) == 0:
                 return mx, mn