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

Merge remote-tracking branch 'origin/master'

parents 12fc45a2 4b079080

.travis.yml

+13 −1
Changes for .travis.yml: 13 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -11,16 +11,28 @@ env: 
  matrix:

    - PYTHON_VERSION: 3.5



os:

  - linux

  - osx



before_install:



install:

  # We do this conditionally because it saves us some downloading if the

  # version is the same.

  - if [[ "$PYTHON_VERSION" == "2.7" ]]; then

  - if [ "$TRAVIS_OS_NAME" == "linux" ]; 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;

      fi

    else

      if ["$PYTHON_VERSION" == 2.7]; then

        curl -o miniconda.sh  https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh;

      else

        curl -o miniconda.sh  https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh;

      fi

    fi

  - bash miniconda.sh -b -p $HOME/miniconda

  - export PATH="$HOME/miniconda/bin:$PATH"

  - hash -r