Merge branch 'master' of github.com:cdat/vcs

CDAT · May 3, 2019 · 3f352fe · 3f352fe
2 parents a49288a + 89123bb
commit 3f352fe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,7 +21,7 @@ aliases:
   - &create_conda_env
     name: create_conda_env
     environment:
-       CHANNELS: "-c cdat/label/nightly -c conda-forge -c cdat"
+       CHANNELS: "-c cdat/label/nightly -c conda-forge"
        PKGS: "cdms2 cdat_info udunits2 testsrunner mesalib matplotlib image-compare genutil dv3d cdutil cdtime nbformat 'proj4<5' numpy ghostscript vtk-cdat"
     command: |
        export PATH=$WORKDIR/miniconda/bin:$PATH
@@ -31,7 +31,7 @@ aliases:
        if [[ $PY_VER = "py2" ]]; then
           conda create -q -n $PY_VER $CUSTOM_CHANNELS $CHANNELS $PKGS $TEMP_PKGS "python<3"
        else
-          conda create -q -n $PY_VER $CUSTOM_CHANNELS $CHANNELS $PKGS $TEMP_PKGS "python=3.6" sphinxcontrib-websupport nbsphinx easydev $COVERAGE_PKGS
+          conda create -q -n $PY_VER $CUSTOM_CHANNELS $CHANNELS $PKGS $TEMP_PKGS "python=3.7" sphinxcontrib-websupport nbsphinx easydev $COVERAGE_PKGS
        fi
 
   - &setup_vcs
@@ -73,7 +73,7 @@ aliases:
   - &conda_upload
     name: conda_upload
     environment:
-       CHANNELS: "-c cdat/label/nightly -c conda-forge -c cdat"
+       CHANNELS: "-c cdat/label/nightly -c conda-forge"
     command: |
        if [[ $CIRCLE_BRANCH != 'master' ]]; then
           exit 0
@@ -90,7 +90,7 @@ aliases:
        ln -s ../recipe vcs
        export PKG_NAME=vcs
        export USER=cdat
-       export VERSION=8.0
+       export VERSION=8.1
        export LABEL=nightly
        python ./prep_for_build.py -l $VERSION
        conda build $PKG_NAME $CHANNELS
@@ -167,6 +167,7 @@ jobs:
       WORKDIR: "workspace/test_linux_vcs_py2"
       OS: "linux-64"
       PY_VER: "py2"
+      CUSTOM_CHANNELS: ""
     steps:
       - checkout
       - run: *setup_miniconda
@@ -191,6 +192,7 @@ jobs:
       PY_VER: "py3"
       COVERAGE: "-c tests/coverage.json --coverage-from-egg"
       COVERAGE_PKGS: "coverage coveralls"
+      CUSTOM_CHANNELS: ""
     steps:
       - checkout
       - run: *setup_miniconda

diff --git a/tests/failing/test_vcs_aspect_ratio.py → tests/test_vcs_aspect_ratio.py b/tests/failing/test_vcs_aspect_ratio.py → tests/test_vcs_aspect_ratio.py
@@ -31,9 +31,9 @@ def plotRatio(self, s, gm, ratio):
             else:
                 orient = "port"
             fnm = "aspect_ratio_%s_%s.png" % (orient, ratio)
-            X.png(fnm, bg=self.bg)
-            print "fnm:",fnm
-            ret +=  self.checkImage(fnm, pngReady=True)
+            #X.png(fnm, bg=self.bg)
+            print("fnm:",fnm)
+            ret += self.checkImage(fnm)
         return ret