trying to make travis work

MartinPerez · Jun 11, 2015 · e636e59 · e636e59
1 parent 750cc8d
commit e636e59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,22 +12,26 @@ env:
     # Ubuntu 14.04 versions
     - DISTRIB="conda" PYTHON_VERSION="2.7"
       NUMPY_VERSION="1.8.1" SCIPY_VERSION="0.13.3"
-      SCIKIT_LEARN_VERSION="0.14.1" MATPLOTLIB_VERSION="1.3.1"
+      SCIKIT_LEARN_VERSION="0.14.1" MATPLOTLIB_VERSION="1.3.1
+      PANDAS_VERSION="0.13.0"
     # Ubuntu 14.04 versions without matplotlib
     - DISTRIB="conda" PYTHON_VERSION="2.7"
       NUMPY_VERSION="1.8.1" SCIPY_VERSION="0.13.3"
       SCIKIT_LEARN_VERSION="0.14.1"
+      PANDAS_VERSION="0.13.0"
     - DISTRIB="neurodebian" PYTHON_VERSION="2.7"
     # Trying to get as close to the minimum required versions while
     # still having the package version available through conda
     - DISTRIB="conda" PYTHON_VERSION="2.6"
       NUMPY_VERSION="1.6.2" SCIPY_VERSION="0.11.0"
       SCIKIT_LEARN_VERSION="0.12.1" MATPLOTLIB_VERSION="1.1.1"
       NIBABEL_VERSION="1.1.0"
+      PANDAS_VERSION="0.13.0"
     # Most recent versions
     - DISTRIB="conda" PYTHON_VERSION="3.4"
       NUMPY_VERSION="*" SCIPY_VERSION="*"
       SCIKIT_LEARN_VERSION="*" MATPLOTLIB_VERSION="*" COVERAGE="true"
+      PANDAS_VERSION="*"
 
 install: 
     - source continuous_integration/install.sh

diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh
@@ -105,6 +105,5 @@ if [[ "$COVERAGE" == "true" ]]; then
 fi
 
 pip install nilearn
-pip install pandas
 
 python setup.py install