update requirements and travis cfg versions

svaante · Sep 28, 2017 · c5142f9 · c5142f9
1 parent e69dfdd
commit c5142f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/ci_scripts/travis/install.sh b/ci_scripts/travis/install.sh
@@ -13,13 +13,13 @@ ls -l
 echo
 if [[ ! -f miniconda.sh ]]
    then
-   wget http://repo.continuum.io/miniconda/Miniconda-3.6.0-Linux-x86_64.sh \
+   wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
        -O miniconda.sh
-   fi
-chmod +x miniconda.sh && ./miniconda.sh -b
-cd ..
-export PATH=/home/travis/miniconda/bin:$PATH
-conda update --yes conda
+fi
+MINICONDA_PATH=/home/travis/miniconda
+    chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
+export PATH=$MINICONDA_PATH/bin:$PATH
+miniconda.sh -b -p $HOME/miniconda
 popd
 
 # Configure the conda environment and put it in the path using the
@@ -38,3 +38,4 @@ python --version
 python -c "import numpy; print('numpy %s' % numpy.__version__)"
 python -c "import scipy; print('scipy %s' % scipy.__version__)"
 python setup.py develop
+
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 numpy>=1.8.2
+scipy>=0.13.3
 nose>=1.1.2
-scikit-learn>=0.17
+scikit-learn>=0.15.0