update conda-build test versions

jonokay · Sep 2, 2016 · d364dc4 · d364dc4
1 parent ee140c2
commit d364dc4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,11 +32,11 @@ matrix:
       os: linux
       language: python
     - python: '3.5'
-      env: CONDA_BUILD=1.21.11
+      env: CONDA_BUILD=2.0.0
       os: linux
       language: python
     - python: '3.5'
-      env: CONDA_BUILD=1.20.3
+      env: CONDA_BUILD=1.21.11
       os: linux
       language: python
 

diff --git a/utils/travis-run-install.sh b/utils/travis-run-install.sh
@@ -77,7 +77,7 @@ conda_build_install() {
     pushd conda-build
     python setup.py install
     conda info
-    conda install -y -q pytest pytest-cov mock anaconda-client
+    conda install -y -q pytest pytest-cov mock anaconda-client filelock
     popd
 }
 

diff --git a/utils/travis-run-script.sh b/utils/travis-run-script.sh
@@ -38,9 +38,9 @@ if [[ $FLAKE8 == true ]]; then
     flake8_test
 elif [[ -n $CONDA_BUILD ]]; then
     conda_build_smoke_test
-    if [[ $CONDA_BUILD == 1.21.11 || $CONDA_BUILD == master ]]; then
-        conda_build_unit_test
-    fi
+    conda_build_unit_test
+    # if [[ $CONDA_BUILD == 1.21.11 || $CONDA_BUILD == master ]]; then
+    # fi
 else
     main_test
 fi