Merge branch 'master' of https://github.com/h-dh/QA-DKRZ

.travis.yml

@@ -9,6 +9,7 @@ python:
   # We don't actually use the Travis Python, but this keeps it organized.
   - "2.7"
 install:
+  - sudo apt-get update -y
   - sudo apt-get install -y libuuid1 uuid-dev bc
   - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
   - bash miniconda.sh -b -p $HOME/miniconda
@@ -22,7 +23,8 @@ install:
 
   # Replace dep1 dep2 ... with your dependencies
   - conda config --add channels birdhouse
-  - conda install -q libnetcdf hdf5 zlib udunits
+  - conda config --add channels ioos
+  - conda install -q libnetcdf hdf5 zlib udunits2
 
   # Get build script
   - export PREFIX="$HOME/miniconda"