Merge pull request #2825 from ccordoba12/fix-travis

Fix tests in Travis after a recent update of conda-build
spyder-ide · Nov 22, 2015 · 711f141 · 711f141
2 parents 10045cb + 018a1da
commit 711f141
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/continuous_integration/appveyor/build_test.bat b/continuous_integration/appveyor/build_test.bat
@@ -1,3 +1,5 @@
+conda info
+
 cd %APPVEYOR_BUILD_FOLDER%
 python setup.py sdist
 if errorlevel 1 exit 1

diff --git a/continuous_integration/travis/install.sh b/continuous_integration/travis/install.sh
@@ -49,6 +49,7 @@ install_conda()
 
     # Installing conda-build to do build tests
     if [ "$USE_CONDA" = true ]; then
+        echo 'conda-build ==1.18.1' > $HOME/miniconda/conda-meta/pinned;
         conda install conda-build;
         conda create -q -n test-environment python=$PY_VERSION;
     fi