Merge pull request #34 from CDAT/fix_test_Suite

Fix test suite
CDAT · Mar 1, 2019 · b5f5020 · b5f5020
2 parents 3bd6383 + 140e160
commit b5f5020
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,8 +16,8 @@ aliases:
   - &create_conda_env
     name: create_conda_env
     environment:
-       PKGS: "genutil nose flake8 'numpy=1.14' cdat_info testsrunner"
-       CHANNELS: "-c cdat/label/nightly -c conda-forge -c cdat"
+       PKGS: "genutil nose flake8 numpy cdat_info testsrunner"
+       CHANNELS: "-c cdat/label/nightly -c conda-forge"
     command: |
        export PATH=$WORKDIR/miniconda/bin:$PATH
        conda config --set always_yes yes --set changeps1 no
@@ -161,13 +161,13 @@ workflows:
   cdutil:
     jobs:
       - macos_cdutil_py2
-      - macos_cdutil_py3:
-           requires:
-              - macos_cdutil_py2
+      - macos_cdutil_py3
+          #     requires:
+          #    - macos_cdutil_py2
       - linux_cdutil_py2
-      - linux_cdutil_py3:
-           requires:
-              - linux_cdutil_py2
+      - linux_cdutil_py3
+          #requires:
+          #    - linux_cdutil_py2
 
 
 

diff --git a/tests/test_cdutil_sftbyrgn.py b/tests/test_cdutil_sftbyrgn.py
@@ -13,8 +13,6 @@
 import cdms2,cdutil,MV2,os,sys,cdat_info
 import unittest
 import numpy
-numpy.set_printoptions(threshold='nan')
-import pprint
 
 class CDUTIL(unittest.TestCase):
     def testSftbyrgn(self):