Commit 49bc0325 authored by Jay's avatar Jay Committed by Jason R Laura
Browse files

Updates to travis for correct dependencies on the build.

parent da391b5e
Loading
Loading
Loading
Loading
+7 −12
Changes for .travis.yml: 7 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ before_install:
install:
  # We do this conditionally because it saves us some downloading if the
  # version is the same.
  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
  - if [[ "$PYTHON_VERSION" == "2.7" ]]; then
      wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
    else
      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
@@ -26,18 +26,13 @@ install:
  # Useful for debugging any issues with conda
  - conda info -a

  # Create a virtual env and install dependencies
  - conda create -y -q -n test-env python=$TRAVIS_PYTHON_VERSION nose numpy pillow scipy pandas networkx scikit-image sqlalchemy numexpr dill cython pyyaml
  # Activate the env
  - source activate test-env

  # Install the non-conda packages if required, requirements.txt duplicates are ignored
  - conda install -c https://conda.anaconda.org/jlaura opencv3=3.0.0
  - conda install -c menpo cyvlfeat
  # Install dependencies
  - conda config --add channels conda-forge
  - conda install runipy
  - conda install -c https://conda.anaconda.org/conda-forge gdal h5py
  - pip install -r requirements.txt
  - conda install -c jlaura plio opencv3
  - conda install -c conda-forge vlfeat
  - conda install -c menpo cyvlfeat
  - pip install pillow
  - conda install scipy networkx numexpr dill cython pyyaml matplotlib runipy

  # Development installation
  - conda install nose coverage sh anaconda-client