From bfd4516c28f2f758d4f9e33923471d8df9b03359 Mon Sep 17 00:00:00 2001 From: Hyunsu Philip Cho Date: Tue, 22 Oct 2019 08:03:05 +0000 Subject: [PATCH 1/3] Use correct version for 'distributed' dependency of 'dask' --- tests/ci_build/Dockerfile.cpu | 2 +- tests/ci_build/Dockerfile.gpu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ci_build/Dockerfile.cpu b/tests/ci_build/Dockerfile.cpu index 0aa29a111eb9..e9c5f76edf64 100644 --- a/tests/ci_build/Dockerfile.cpu +++ b/tests/ci_build/Dockerfile.cpu @@ -24,7 +24,7 @@ RUN \ pip install pyyaml cpplint pylint astroid sphinx numpy scipy pandas matplotlib sh recommonmark guzzle_sphinx_theme mock \ breathe matplotlib graphviz pytest scikit-learn wheel kubernetes urllib3 && \ pip install https://h2o-release.s3.amazonaws.com/datatable/stable/datatable-0.7.0/datatable-0.7.0-cp37-cp37m-linux_x86_64.whl && \ - pip install "dask[complete]==2.0.0" + pip install "dask[complete]==2.0.0" distributed==2.0.1 # Install lightweight sudo (not bound to TTY) RUN set -ex; \ diff --git a/tests/ci_build/Dockerfile.gpu b/tests/ci_build/Dockerfile.gpu index 183d8c3634ef..60c4d33aa2e2 100644 --- a/tests/ci_build/Dockerfile.gpu +++ b/tests/ci_build/Dockerfile.gpu @@ -17,7 +17,7 @@ ENV PATH=/opt/python/bin:$PATH # Install Python packages RUN \ pip install numpy pytest scipy scikit-learn pandas matplotlib wheel kubernetes urllib3 graphviz && \ - pip install "dask[complete]==2.0.0" + pip install "dask[complete]==2.0.0" distributed==2.0.1 ENV GOSU_VERSION 1.10 From 34f42ca71af10d5babdf09c9d2fe9b30a397ec14 Mon Sep 17 00:00:00 2001 From: Hyunsu Philip Cho Date: Tue, 22 Oct 2019 08:40:15 +0000 Subject: [PATCH 2/3] Use latest Dask (2.6.0) --- tests/ci_build/Dockerfile.cpu | 2 +- tests/ci_build/Dockerfile.cudf | 2 +- tests/ci_build/Dockerfile.gpu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ci_build/Dockerfile.cpu b/tests/ci_build/Dockerfile.cpu index e9c5f76edf64..34e51cc00e02 100644 --- a/tests/ci_build/Dockerfile.cpu +++ b/tests/ci_build/Dockerfile.cpu @@ -24,7 +24,7 @@ RUN \ pip install pyyaml cpplint pylint astroid sphinx numpy scipy pandas matplotlib sh recommonmark guzzle_sphinx_theme mock \ breathe matplotlib graphviz pytest scikit-learn wheel kubernetes urllib3 && \ pip install https://h2o-release.s3.amazonaws.com/datatable/stable/datatable-0.7.0/datatable-0.7.0-cp37-cp37m-linux_x86_64.whl && \ - pip install "dask[complete]==2.0.0" distributed==2.0.1 + pip install "dask[complete]==2.6.0" # Install lightweight sudo (not bound to TTY) RUN set -ex; \ diff --git a/tests/ci_build/Dockerfile.cudf b/tests/ci_build/Dockerfile.cudf index 4523e6ac5a7d..e5609a6ca393 100644 --- a/tests/ci_build/Dockerfile.cudf +++ b/tests/ci_build/Dockerfile.cudf @@ -18,7 +18,7 @@ ENV PATH=/opt/python/bin:$PATH # Create new Conda environment with cuDF and dask RUN \ conda create -n cudf_test -c rapidsai -c nvidia -c numba -c conda-forge -c anaconda \ - cudf=0.9 python=3.7 anaconda::cudatoolkit=$CUDA_VERSION dask=2.0.0 + cudf=0.9 python=3.7 anaconda::cudatoolkit=$CUDA_VERSION dask=2.6.0 # Install other Python packages RUN \ diff --git a/tests/ci_build/Dockerfile.gpu b/tests/ci_build/Dockerfile.gpu index 60c4d33aa2e2..8bd41f39c6c1 100644 --- a/tests/ci_build/Dockerfile.gpu +++ b/tests/ci_build/Dockerfile.gpu @@ -17,7 +17,7 @@ ENV PATH=/opt/python/bin:$PATH # Install Python packages RUN \ pip install numpy pytest scipy scikit-learn pandas matplotlib wheel kubernetes urllib3 graphviz && \ - pip install "dask[complete]==2.0.0" distributed==2.0.1 + pip install "dask[complete]==2.6.0" ENV GOSU_VERSION 1.10 From 85db3103ee08a1bc7e3777bd37683d8b5c53d10d Mon Sep 17 00:00:00 2001 From: Hyunsu Philip Cho Date: Tue, 22 Oct 2019 09:22:53 +0000 Subject: [PATCH 3/3] Remove version spec, to use latest dask always --- tests/ci_build/Dockerfile.cpu | 2 +- tests/ci_build/Dockerfile.cudf | 2 +- tests/ci_build/Dockerfile.gpu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ci_build/Dockerfile.cpu b/tests/ci_build/Dockerfile.cpu index 34e51cc00e02..1890a64eae7b 100644 --- a/tests/ci_build/Dockerfile.cpu +++ b/tests/ci_build/Dockerfile.cpu @@ -24,7 +24,7 @@ RUN \ pip install pyyaml cpplint pylint astroid sphinx numpy scipy pandas matplotlib sh recommonmark guzzle_sphinx_theme mock \ breathe matplotlib graphviz pytest scikit-learn wheel kubernetes urllib3 && \ pip install https://h2o-release.s3.amazonaws.com/datatable/stable/datatable-0.7.0/datatable-0.7.0-cp37-cp37m-linux_x86_64.whl && \ - pip install "dask[complete]==2.6.0" + pip install "dask[complete]" # Install lightweight sudo (not bound to TTY) RUN set -ex; \ diff --git a/tests/ci_build/Dockerfile.cudf b/tests/ci_build/Dockerfile.cudf index e5609a6ca393..02d6c9325aee 100644 --- a/tests/ci_build/Dockerfile.cudf +++ b/tests/ci_build/Dockerfile.cudf @@ -18,7 +18,7 @@ ENV PATH=/opt/python/bin:$PATH # Create new Conda environment with cuDF and dask RUN \ conda create -n cudf_test -c rapidsai -c nvidia -c numba -c conda-forge -c anaconda \ - cudf=0.9 python=3.7 anaconda::cudatoolkit=$CUDA_VERSION dask=2.6.0 + cudf=0.9 python=3.7 anaconda::cudatoolkit=$CUDA_VERSION dask # Install other Python packages RUN \ diff --git a/tests/ci_build/Dockerfile.gpu b/tests/ci_build/Dockerfile.gpu index 8bd41f39c6c1..533110019875 100644 --- a/tests/ci_build/Dockerfile.gpu +++ b/tests/ci_build/Dockerfile.gpu @@ -17,7 +17,7 @@ ENV PATH=/opt/python/bin:$PATH # Install Python packages RUN \ pip install numpy pytest scipy scikit-learn pandas matplotlib wheel kubernetes urllib3 graphviz && \ - pip install "dask[complete]==2.6.0" + pip install "dask[complete]" ENV GOSU_VERSION 1.10