From ceebd851b688081f21ae43f588a1e4457da264d7 Mon Sep 17 00:00:00 2001
From: Jason R Laura <jlaura@igswzawglt-mjay.local>
Date: Thu, 16 Jun 2016 12:31:29 -0700
Subject: [PATCH] trying to fix the incorrect GDAL installation
---
.travis.yml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 9a73d6d..fbb86b6 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
--
GitLab