diff --git a/.travis.yml b/.travis.yml index 9a73d6d91a594c1a77f3b8d52cb5b85c4b82a783..fbb86b63a44822ba68f698872a2be6569be11776 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,7 @@ env: matrix: - PYTHON_VERSION: 3.5 - - -os: +os: - linux - osx @@ -45,14 +43,13 @@ install: # Install not using env because build needs to be in root env - conda install -c conda-forge gdal h5py - conda install pandas sqlalchemy pyyaml - - pip install pvl protobuf==3.0.0.b2 + - conda install -c jlaura pvl protobuf==3.0.0.b2 # Development installation - conda install nose coverage - pip install coveralls # Install sh and binstar to support upload to Anaconda - - conda config --add channels jlaura - conda install -n root conda-build - conda install sh anaconda-client