Vcs templates (#384)

* fix #380 * no pribt debug * renamed Share to share * trying to use dan mac build and do linkage * correct job name * downgrade conda * Shre is now share * ok animation zvalue is not correct need to add this tomorrow * baselines, and beg of flake8 * flake8 passes again * all tests pass on my mac py3 * correct prefix * correct the typo * on my mac no need to do the ln if mesalib * try to get the mesalib version and only run mac py3 * seems to not trigger... * ok... still no trigger, removing all comemnts * ok putting all jobs back in... * trying to use 1/26 mesalib with symlinking * correct sign for version * correct symlinking? * fine tuning doc strings * new flake8 on linux picked these up * missed one new flake8 failure
CDAT · Jan 30, 2019 · 22418d8 · 22418d8
1 parent c8a8363
commit 22418d8
Show file tree

Hide file tree

Showing 51 changed files with 243 additions and 227 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,16 +22,17 @@ aliases:
     name: create_conda_env
     environment:
        CHANNELS: "-c cdat/label/nightly -c conda-forge -c cdat"
-       PKGS: "cdms2 cdat_info udunits2 testsrunner mesalib matplotlib image-compare genutil dv3d cdutil cdtime nbformat 'vtk-cdat>8.1' 'proj4<5' 'numpy>1.14' ghostscript"
+       PKGS: "cdms2 cdat_info udunits2 testsrunner mesalib matplotlib image-compare genutil dv3d cdutil cdtime nbformat 'vtk-cdat<8.2.0.rc2.289.8.0.2019.01.28.16' 'proj4<5' 'numpy>1.14' ghostscript"
     command: |
        export PATH=$WORKDIR/miniconda/bin:$PATH
        conda config --set always_yes yes --set changeps1 no
        conda update -y -q conda
+       conda install -n base "conda<4.6"
        conda config --set anaconda_upload no
        if [[ $PY_VER = "py2" ]]; then
-          conda create -q -n $PY_VER $CHANNELS $PKGS $TEMP_PKGS "python<3"
+          conda create -q -n $PY_VER $CUSTOM_CHANNELS $CHANNELS $PKGS $TEMP_PKGS "python<3"
        else
-          conda create -q -n $PY_VER $CHANNELS $PKGS $TEMP_PKGS "python>3" nbsphinx easydev $COVERAGE_PKGS
+          conda create -q -n $PY_VER $CUSTOM_CHANNELS $CHANNELS $PKGS $TEMP_PKGS "python>3" nbsphinx easydev $COVERAGE_PKGS
        fi
 
   - &setup_vcs
@@ -70,6 +71,14 @@ aliases:
        fi
        exit $RESULT
 
+  - &templink
+    name: templink
+    command: |
+       export PATH=$WORKDIR/miniconda/bin:$PATH
+       source activate $PY_VER
+       rm ${WORKDIR}/miniconda/envs/$PY_VER/bin/python
+       ln -s $(pwd)/$WORKDIR/miniconda/envs/$PY_VER/bin/vtkpython $(pwd)/$WORKDIR/miniconda/envs/$PY_VER/bin/python
+        
   - &conda_upload
     name: conda_upload
     environment:
@@ -120,6 +129,7 @@ jobs:
       OS: "osx-64"
       PY_VER: "py2"
       TEMP_PKGS: "'ffmpeg>4' 'libpng>1.6.34'"
+      CUSTOM_CHANNELS: "-c danlipsa"
     steps:
       - checkout
       - run: *setup_miniconda
@@ -142,11 +152,13 @@ jobs:
       OS: "osx-64"
       PY_VER: "py3"
       TEMP_PKGS: "'ffmpeg>4' 'libpng>1.6.34'"
+      CUSTOM_CHANNELS: "-c danlipsa"
     steps:
       - checkout
       - run: *setup_miniconda
       - run: *get_testdata
       - run: *create_conda_env
+      - run: *templink
       - run: *setup_vcs
       - run: *run_vcs_tests
       - store_artifacts:

diff --git a/run_tests.py b/run_tests.py
@@ -21,7 +21,7 @@ def _prep_nose_options(self):
 runner = VCSTestRunner(test_suite_name, options=["--no-vtk-ui", "--vtk"],
                        options_files=["tests/vcs_runtests.json"],
                        get_sample_data=True,
-                       test_data_files_info="Share/test_data_files.txt")
+                       test_data_files_info="share/test_data_files.txt")
 ret_code = runner.run(workdir)
 
 sys.exit(ret_code)
diff --git a/setup.py b/setup.py
@@ -34,25 +34,25 @@
       #package_dir={'vcs': 'vcs'},
       scripts= ["scripts/vcs_download_sample_data"],
       zip_safe=True,
-      data_files=[('share/vcs', ('Share/wmo_symbols.json',
-                                 'Share/data_continent_coarse',
-                                 'Share/data_continent_political',
-                                 'Share/data_continent_river',
-                                 'Share/data_continent_states',
-                                 'Share/data_continent_other7',
-                                 'Share/data_continent_fine',
-                                 'Share/initial.attributes',
-                                 'Share/cdat.png',
-                                 'Share/marker_icon.png',
-                                 'Share/text_icon.png',
-                                 'Share/fill_icon.png',
-                                 'Share/line_icon.png',
-                                 'Share/sample_files.txt',
-                                 'Share/mapper.js',
-                                 'Share/cvi_tip_lib.js',
-                                 'Share/tooltip.css',
-                                 'Share/modal.js',
-                                 'Share/test_data_files.txt')),
+      data_files=[('share/vcs', ('share/wmo_symbols.json',
+                                 'share/data_continent_coarse',
+                                 'share/data_continent_political',
+                                 'share/data_continent_river',
+                                 'share/data_continent_states',
+                                 'share/data_continent_other7',
+                                 'share/data_continent_fine',
+                                 'share/initial.attributes',
+                                 'share/cdat.png',
+                                 'share/marker_icon.png',
+                                 'share/text_icon.png',
+                                 'share/fill_icon.png',
+                                 'share/line_icon.png',
+                                 'share/sample_files.txt',
+                                 'share/mapper.js',
+                                 'share/cvi_tip_lib.js',
+                                 'share/tooltip.css',
+                                 'share/modal.js',
+                                 'share/test_data_files.txt')),
                   ('share/vcs/fonts', ('Fonts/Adelon_Regular.ttf',
                                        'Fonts/Arabic.ttf',
                                        'Fonts/Athens_Greek.ttf',

diff --git a/Share/cdat.png → share/cdat.png b/Share/cdat.png → share/cdat.png
diff --git a/Share/cvi_tip_lib.js → share/cvi_tip_lib.js b/Share/cvi_tip_lib.js → share/cvi_tip_lib.js
diff --git a/Share/data_continent_coarse → share/data_continent_coarse b/Share/data_continent_coarse → share/data_continent_coarse
diff --git a/Share/data_continent_fine → share/data_continent_fine b/Share/data_continent_fine → share/data_continent_fine
diff --git a/Share/data_continent_other7 → share/data_continent_other7 b/Share/data_continent_other7 → share/data_continent_other7
diff --git a/Share/data_continent_political → share/data_continent_political b/Share/data_continent_political → share/data_continent_political
diff --git a/Share/data_continent_river → share/data_continent_river b/Share/data_continent_river → share/data_continent_river
diff --git a/Share/data_continent_states → share/data_continent_states b/Share/data_continent_states → share/data_continent_states
diff --git a/Share/fill_icon.png → share/fill_icon.png b/Share/fill_icon.png → share/fill_icon.png
diff --git a/Share/fonts → share/fonts b/Share/fonts → share/fonts
diff --git a/Share/initial.attributes → share/initial.attributes b/Share/initial.attributes → share/initial.attributes
diff --git a/Share/line_icon.png → share/line_icon.png b/Share/line_icon.png → share/line_icon.png
diff --git a/Share/mapper.js → share/mapper.js b/Share/mapper.js → share/mapper.js
diff --git a/Share/marker_icon.png → share/marker_icon.png b/Share/marker_icon.png → share/marker_icon.png
diff --git a/Share/modal.js → share/modal.js b/Share/modal.js → share/modal.js
diff --git a/Share/sample_files.txt → share/sample_files.txt b/Share/sample_files.txt → share/sample_files.txt
diff --git a/Share/test_data_files.txt → share/test_data_files.txt b/Share/test_data_files.txt → share/test_data_files.txt
diff --git a/Share/text_icon.png → share/text_icon.png b/Share/text_icon.png → share/text_icon.png
diff --git a/Share/tooltip.css → share/tooltip.css b/Share/tooltip.css → share/tooltip.css
diff --git a/Share/vcs → share/vcs b/Share/vcs → share/vcs
diff --git a/Share/wmo_symbols.json → share/wmo_symbols.json b/Share/wmo_symbols.json → share/wmo_symbols.json
diff --git a/tests/share/template_test_associated_dump.json b/tests/share/template_test_associated_dump.json
@@ -195,7 +195,7 @@
     "y": 0.922999978065
    }, 
    "tname": {
-    "priority": 1, 
+    "priority": 0, 
     "textorientation": "default", 
     "texttable": "default", 
     "x": 0.0, 
@@ -217,7 +217,7 @@
    }, 
    "tvalue": {
     "format": "default", 
-    "priority": 1, 
+    "priority": 0, 
     "textorientation": "default", 
     "texttable": "default", 
     "x": 0.800000011921, 
@@ -274,15 +274,15 @@
     "y2": 0.871999979019
    }, 
    "xunits": {
-    "priority": 1, 
+    "priority": 0, 
     "textorientation": "default", 
     "texttable": "default", 
     "x": 0.600000023842, 
-    "y": 0.277000010014
+    "y": 0.21
    }, 
    "xvalue": {
     "format": "default", 
-    "priority": 1, 
+    "priority": 0, 
     "textorientation": "default", 
     "texttable": "default", 
     "x": 0.800000011921, 
@@ -332,15 +332,15 @@
     "x2": 0.959999978542
    }, 
    "yunits": {
-    "priority": 1, 
-    "textorientation": "default", 
+    "priority": 0, 
+    "textorientation": "defup", 
     "texttable": "default", 
-    "x": 0.019999999553, 
+    "x": 0.006, 
     "y": 0.658999979496
    }, 
    "yvalue": {
     "format": "default", 
-    "priority": 1, 
+    "priority": 0, 
     "textorientation": "default", 
     "texttable": "default", 
     "x": 0.800000011921, 

diff --git a/vcs/Canvas.py b/vcs/Canvas.py
@@ -714,9 +714,9 @@ def _reconstruct_tv(self, arglist, keyargs):
         isgridded = (grid is not None)
 
         # Set the default graphics method if not already set.
+        # See _determine_arg_list
         if arglist[GRAPHICS_METHOD] == "default" or\
                 (arglist[GRAPHICS_METHOD] == 'boxfill' and arglist[GRAPHICS_METHOD + 1] == "default"):
-                        # See _determine_arg_list
 
             if grid is None:
                 if tv.ndim == 1:
@@ -2823,13 +2823,13 @@ def __new_elts(self, original, new):
 
     def __plot(self, arglist, keyargs):
 
-            # This routine has five arguments in arglist from _determine_arg_list
-            # It adds one for bg and passes those on to Canvas.plot as its sixth
-            # arguments.
+        # This routine has five arguments in arglist from _determine_arg_list
+        # It adds one for bg and passes those on to Canvas.plot as its sixth
+        # arguments.
 
-            # First of all let's remember which elets we have before comin in here
-            # so that anything added (temp objects) can be removed at clear
-            # time
+        # First of all let's remember which elets we have before comin in here
+        # so that anything added (temp objects) can be removed at clear
+        # time
         original_elts = {}
         new_elts = {}
         for k in list(vcs.elements.keys()):

diff --git a/vcs/Pformat.py b/vcs/Pformat.py
@@ -133,15 +133,18 @@ def __init__(self, member):
         if member == "xvalue":
             self.x = 0.800000011921
             self.y = 0.941999971867
+            self.priority = 0
         elif member == "yvalue":
             self.x = 0.800000011921
             self.y = 0.922999978065
+            self.priority = 0
         elif member == "zvalue":
             self.x = 0.800000011921
             self.y = 0.902999997139
         elif member == "tvalue":
             self.x = 0.800000011921
             self.y = 0.883000016212
+            self.priority = 0
         elif member == "mean":
             self.x = 0.0500000007451
             self.y = 0.899999976158

diff --git a/vcs/Ptext.py b/vcs/Ptext.py
@@ -183,12 +183,16 @@ def __init__(self, member):
         elif member == "tname":
             self.x = 0.
             self.y = 0.995000004768
+            self.priority = 0
         elif member == "xunits":
             self.x = 0.600000023842
-            self.y = 0.277000010014
+            self.y = 0.21
+            self.priority = 0
         elif member == "yunits":
-            self.x = 0.019999999553
+            self.x = 0.006
             self.y = 0.658999979496
+            self.textorientation = "defup"
+            self.priority = 0
         elif member == "zunits":
             self.x = 0.
             self.y = 0.995000004768

diff --git a/vcs/VCS_validation_functions.py b/vcs/VCS_validation_functions.py
@@ -118,7 +118,7 @@ def checkContinents(self, value):
                 "data_continent_%s" % nms[value - 1])
 
             if not os.path.exists(path):
-                    # fallback on installed with system one
+                # fallback on installed with system one
                 path = os.path.join(
                     vcs.vcs_egg_path,
                     "data_continent_%s" % nms[
@@ -365,7 +365,7 @@ def checkMarker(self, name, value):
         elif value in range(100, 203):
             value = "w%.2i" % (value - 100)
         elif (queries.ismarker(value) == 1):
-                value = value.name
+            value = value.name
 
     else:
         checkedRaise(

diff --git a/vcs/VTKPlots.py b/vcs/VTKPlots.py
@@ -1123,6 +1123,8 @@ def renderTemplate(self, tmpl, data, gm, taxis,
 
         # ok first basic template stuff, let's store the displays
         # because we need to return actors for min/max/mean
+        kargs["taxis"] = taxis
+        kargs["zaxis"] = zaxis
         displays = tmpl.plot(
             self.canvas,
             data,

diff --git a/vcs/colormap.py b/vcs/colormap.py
@@ -286,15 +286,15 @@ def setindex(self, value):
     ##########################################################################
 
     def __init__(self, Cp_name, Cp_name_src='default'):
-            #                                                             #
-            ###############################################################
-            # Initialize the colormap class and its members               #
-            #                                                             #
-            # The getCpmember function retrieves the values of the        #
-            # colormap members in the C structure and passes back the     #
-            # appropriate Python Object.                                  #
-            ###############################################################
-            #                                                             #
+        #                                                             #
+        ###############################################################
+        # Initialize the colormap class and its members               #
+        #                                                             #
+        # The getCpmember function retrieves the values of the        #
+        # colormap members in the C structure and passes back the     #
+        # appropriate Python Object.                                  #
+        ###############################################################
+        #                                                             #
         self.s_name = 'Cp'
         self._name = Cp_name
         if Cp_name == "default":

diff --git a/vcs/displayplot.py b/vcs/displayplot.py
@@ -301,14 +301,14 @@ def _set_backend(self, value):
     #                                                                           #
     ##########################################################################
     def __init__(self, Dp_name, Dp_name_src='default', parent=None):
-            #                                                                           #
-            ###################################################################
-            # Initialize the display plot's class and its members                       #
-            # The getDpmember function retrieves the values of the                      #
-            # display plot members in the C structure and passes back the               #
-            # appropriate Python Object.                                                #
-            ###################################################################
-            #                                                                           #
+        #                                                                           #
+        ###################################################################
+        # Initialize the display plot's class and its members                       #
+        # The getDpmember function retrieves the values of the                      #
+        # display plot members in the C structure and passes back the               #
+        # appropriate Python Object.                                                #
+        ###################################################################
+        #                                                                           #
         self.extradisplays = []
         self._name = Dp_name
         self.s_name = 'Dp'

diff --git a/vcs/fillarea.py b/vcs/fillarea.py
@@ -387,14 +387,14 @@ def _sety(self, value):
     #
     #
     def __init__(self, Tf_name=None, Tf_name_src='default'):
-                    #
-                    #
-                    # Initialize the fillarea class and its members           #
-                    # The getTfmember function retrieves the values of the    #
-                    # fillarea members in the C structure and passes back the #
-                    # appropriate Python Object.                              #
-                    #
-                    #
+        #
+        #
+        # Initialize the fillarea class and its members           #
+        # The getTfmember function retrieves the values of the    #
+        # fillarea members in the C structure and passes back the #
+        # appropriate Python Object.                              #
+        #
+        #
         if isinstance(Tf_name_src, Tf):
             Tf_name_src = Tf_name_src.name
         if Tf_name_src != "default" and Tf_name_src not in list(vcs.elements[

diff --git a/vcs/isofill.py b/vcs/isofill.py
@@ -574,14 +574,14 @@ def _setdatawc_y2(self, value):
     levels = VCS_validation_functions.levels
 
     def __init__(self, Gfi_name, Gfi_name_src='default'):
-                #
-                #
-                # Initialize the isofill class and its members            #
-                # The getGfimember function retrieves the values of the   #
-                # isofill members in the C structure and passes back the  #
-                # appropriate Python Object.                              #
-                #
-                #
+        #
+        #
+        # Initialize the isofill class and its members            #
+        # The getGfimember function retrieves the values of the   #
+        # isofill members in the C structure and passes back the  #
+        # appropriate Python Object.                              #
+        #
+        #
         if not isinstance(Gfi_name, str):
             raise ValueError("Isofill name must be a string")
         if Gfi_name in list(vcs.elements["isofill"].keys()):

diff --git a/vcs/isoline.py b/vcs/isoline.py
@@ -886,14 +886,14 @@ def _setclockwise(self, value):
     clockwise = property(_getclockwise, _setclockwise)
 
     def __init__(self, Gi_name, Gi_name_src='default'):
-                #                                                         #
-                ###########################################################
-                # Initialize the isoline class and its members            #
-                # The getGimember function retrieves the values of the   #
-                # isoline members in the C structure and passes back the  #
-                # appropriate Python Object.                              #
-                ###########################################################
-                #                                                         #
+        #                                                         #
+        ###########################################################
+        # Initialize the isoline class and its members            #
+        # The getGimember function retrieves the values of the   #
+        # isoline members in the C structure and passes back the  #
+        # appropriate Python Object.                              #
+        ###########################################################
+        #                                                         #
         if not isinstance(Gi_name, str):
             raise ValueError("Isoline name must be a string")
         if Gi_name in list(vcs.elements["isoline"].keys()):