From 9be6424b4b5c7db8bbd4f1cb17bfdcf2eed9b180 Mon Sep 17 00:00:00 2001
From: Blake Griffith <blake.a.griffith@gmail.com>
Date: Mon, 18 May 2015 14:10:01 -0500
Subject: [PATCH] Install dask[array] from pypi for travis and appveyor

---
 .travis.yml                     | 1 -
 appveyor.yml                    | 1 -
 tools/appveyor/requirements.txt | 1 +
 tools/travis_script.sh          | 2 ++
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 56909d28..14dd7c30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,6 @@ before_install:
     - tools/build_versions.py
 
 install:
-    - pip install git+https://github.com/cowlicks/dask@skimage --upgrade
     - python setup.py build_ext --inplace
     - python setup.py install
 
diff --git a/appveyor.yml b/appveyor.yml
index 4efeca11..0bd10075 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,7 +39,6 @@ install:
   # Install the build and runtime dependencies of the project.
   - "%CMD_IN_ENV% pip install -v %WHEELHOUSE% -r tools/appveyor/requirements.txt"
   - "%CMD_IN_ENV% pip install -v -r requirements.txt"
-  - "%CMD_IN_ENV% pip install git+https://github.com/cowlicks/dask@skimage --upgrade"
   - "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst"
   - ps: "ls dist"
 
diff --git a/tools/appveyor/requirements.txt b/tools/appveyor/requirements.txt
index 9cc4022f..58a4ecfa 100644
--- a/tools/appveyor/requirements.txt
+++ b/tools/appveyor/requirements.txt
@@ -13,5 +13,6 @@ scipy==0.14.0
 cython==0.20.2
 matplotlib==1.4.2
 pillow==2.6.1
+dask[array]>=0.5.0
 wheel
 nose
diff --git a/tools/travis_script.sh b/tools/travis_script.sh
index 8dc2bb4e..30777285 100755
--- a/tools/travis_script.sh
+++ b/tools/travis_script.sh
@@ -67,6 +67,8 @@ fi
 
 retry pip install -q tifffile
 
+pip install 'dask[array]>=0.5.0'
+
 section_end "Install.optional.dependencies"