Merge branch 'next' into release

landlab · Sep 19, 2018 · 9b0aef5 · 9b0aef5
2 parents ec2c6d7 + db733da
commit 9b0aef5
Show file tree

Hide file tree

Showing 3 changed files with 392 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,8 @@ install:
 - export PATH="$CONDA_PREFIX/bin:$PATH"
 - hash -r
 - conda config --set always_yes yes --set changeps1 no
-- conda install python=$TRAVIS_PYTHON_VERSION
+- conda create -n _testing python=$TRAVIS_PYTHON_VERSION
+- source activate _testing
 - conda install scripting -c csdms-stack
 - conda install landlab jupyter -c landlab
 - conda info -a && conda list

diff --git a/flow__distance_utility/Application of flow__distance utility.ipynb b/flow__distance_utility/Application of flow__distance utility.ipynb