From 283de859d43b6499b379e871b014803f9eac828b Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Tue, 5 Sep 2017 12:03:17 +0100 Subject: [PATCH 01/10] Use latest dask master in Travis. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ddb7c1b536..5e244c8eb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,11 +82,11 @@ install: ln -s $(pwd)/iris-test-data-${IRIS_TEST_DATA_SUFFIX} iris-test-data; fi -# Download + install dask from dask PR #2301 +# Download + install dask from latest master - conda uninstall --quiet dask - - wget https://github.com/jcrist/dask/archive/masked-array.zip; - - unzip masked-array.zip; - - cd dask-masked-array && python setup.py --quiet install; + - wget https://github.com/dask/dask/archive/master.zip; + - unzip master.zip; + - cd dask-master && python setup.py --quiet install; - cd ..; # prepare iris build directory From 4173041cc03ffc383dcf2d41f389a3b050e75ab0 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Tue, 5 Sep 2017 15:36:36 +0100 Subject: [PATCH 02/10] Add a build step. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5e244c8eb5..d21ae1a2cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,9 @@ install: - conda uninstall --quiet dask - wget https://github.com/dask/dask/archive/master.zip; - unzip master.zip; - - cd dask-master && python setup.py --quiet install; + - cd dask-master; + - python setup.py --quiet build; + - python setup.py --quiet install; - cd ..; # prepare iris build directory From d9ad2dbbf18fcd647e2470f9ee50c6da8c906048 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Tue, 5 Sep 2017 23:20:02 +0100 Subject: [PATCH 03/10] Debug travis dask install. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d21ae1a2cd..f71bb78b5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,6 +89,7 @@ install: - cd dask-master; - python setup.py --quiet build; - python setup.py --quiet install; + - python -c "import dask; print dask; print dask.__version__; import dask.array.ma as dma; print dma" - cd ..; # prepare iris build directory From 348934c6af3383e9eaaf94225c2047b06fdfca4d Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Wed, 6 Sep 2017 10:54:52 +0100 Subject: [PATCH 04/10] Run dask test outside of dask download. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f71bb78b5a..a3758320f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,8 +89,8 @@ install: - cd dask-master; - python setup.py --quiet build; - python setup.py --quiet install; - - python -c "import dask; print dask; print dask.__version__; import dask.array.ma as dma; print dma" - cd ..; + - python -c "import dask; print dask; print dask.__version__; import dask.array.ma as dma; print dma" # prepare iris build directory - python setup.py --with-unpack build_ext --include-dirs=${PREFIX}/include --library-dirs=${PREFIX}/lib From 9facc1c3b0b32f89df1679f7e131df04a15891f5 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Wed, 6 Sep 2017 11:16:05 +0100 Subject: [PATCH 05/10] Split dask checks. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3758320f7..beecd1fc81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,7 +90,8 @@ install: - python setup.py --quiet build; - python setup.py --quiet install; - cd ..; - - python -c "import dask; print dask; print dask.__version__; import dask.array.ma as dma; print dma" + - python -c "import dask; print dask; print dask.__version__"; + - python -c "import dask.array.ma as dma; print dma" # prepare iris build directory - python setup.py --with-unpack build_ext --include-dirs=${PREFIX}/include --library-dirs=${PREFIX}/lib From 743c30e2fc447b137f07ee07300abec3ec9c8b68 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Wed, 6 Sep 2017 11:37:06 +0100 Subject: [PATCH 06/10] Check no dask initially. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index beecd1fc81..2aa88b8bb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,6 +84,7 @@ install: # Download + install dask from latest master - conda uninstall --quiet dask + - python -c "import dask" || echo "no dask present"; - wget https://github.com/dask/dask/archive/master.zip; - unzip master.zip; - cd dask-master; From 0be77861bafddbcad7f46d4de2e4b25faaa505a3 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Wed, 6 Sep 2017 11:41:41 +0100 Subject: [PATCH 07/10] Show install files for ma.py. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2aa88b8bb2..d98d119c50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,6 +92,8 @@ install: - python setup.py --quiet install; - cd ..; - python -c "import dask; print dask; print dask.__version__"; + - ls -l ./dask-master/dask/array/ma.py; + - ls -l ./dask-master/build/lib/dask/array/ma.py; - python -c "import dask.array.ma as dma; print dma" # prepare iris build directory From f59f691b2f6dfedea84f8d7206edc1ef24110b64 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Wed, 6 Sep 2017 12:07:33 +0100 Subject: [PATCH 08/10] Add -y to uninstall; improve uninstall check. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d98d119c50..4e0ed2a6eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,8 +83,8 @@ install: fi # Download + install dask from latest master - - conda uninstall --quiet dask - - python -c "import dask" || echo "no dask present"; + - conda uninstall --quiet -y dask + - python -c "import dask; print dask" || echo "no dask present"; - wget https://github.com/dask/dask/archive/master.zip; - unzip master.zip; - cd dask-master; From beb1b5594121714891ad3483ba1a2218c034e3dd Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Wed, 6 Sep 2017 12:58:16 +0100 Subject: [PATCH 09/10] Debug presence/location/version of dask module at several points. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e0ed2a6eb..f9fe862ad9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,15 +83,16 @@ install: fi # Download + install dask from latest master + - python -c "import dask; print dask; print dask.__version__" || echo "no dask present"; - conda uninstall --quiet -y dask - - python -c "import dask; print dask" || echo "no dask present"; + - python -c "import dask; print dask; print dask.__version__" || echo "no dask present"; - wget https://github.com/dask/dask/archive/master.zip; - unzip master.zip; - cd dask-master; - python setup.py --quiet build; - python setup.py --quiet install; - cd ..; - - python -c "import dask; print dask; print dask.__version__"; + - python -c "import dask; print dask; print dask.__version__" || echo "no dask present"; - ls -l ./dask-master/dask/array/ma.py; - ls -l ./dask-master/build/lib/dask/array/ma.py; - python -c "import dask.array.ma as dma; print dma" From aacc145881954841f505bda8fd6da7a70387587f Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Wed, 6 Sep 2017 13:22:11 +0100 Subject: [PATCH 10/10] Replace conda uninstall with pip uninstall. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f9fe862ad9..e192e1f8a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ install: # Download + install dask from latest master - python -c "import dask; print dask; print dask.__version__" || echo "no dask present"; - - conda uninstall --quiet -y dask + - pip uninstall -y dask - python -c "import dask; print dask; print dask.__version__" || echo "no dask present"; - wget https://github.com/dask/dask/archive/master.zip; - unzip master.zip;