From 668475a1ed6d9b5ebded910fc43d62bfffc10a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Mon, 7 May 2018 20:57:43 +0200 Subject: [PATCH] Use released version of distributed. At the time of writing you need to have both dask and distributed master. Also this seems like a better idea to test against lreleased version of distributed in our CI. --- ci/sge/Dockerfile-master | 1 - ci/sge/Dockerfile-slave | 1 - 2 files changed, 2 deletions(-) diff --git a/ci/sge/Dockerfile-master b/ci/sge/Dockerfile-master index 745eddcb..515b59ae 100644 --- a/ci/sge/Dockerfile-master +++ b/ci/sge/Dockerfile-master @@ -12,7 +12,6 @@ ENV PATH /opt/anaconda/bin:$PATH RUN conda install -n root conda=4.4.11 && conda clean -tipy RUN conda install -c conda-forge dask distributed blas pytest mock ipython pip psutil && conda clean -tipy RUN pip install --no-cache-dir drmaa -RUN pip install --no-cache-dir git+https://github.com/dask/distributed.git --upgrade COPY ./*.sh / COPY ./*.txt / diff --git a/ci/sge/Dockerfile-slave b/ci/sge/Dockerfile-slave index 509c38cc..516eb940 100644 --- a/ci/sge/Dockerfile-slave +++ b/ci/sge/Dockerfile-slave @@ -12,7 +12,6 @@ ENV PATH /opt/anaconda/bin:$PATH RUN conda install -n root conda=4.4.11 && conda clean -tipy RUN conda install -c conda-forge dask distributed blas pytest mock ipython pip psutil && conda clean -tipy RUN pip install --no-cache-dir drmaa -RUN pip install --no-cache-dir git+https://github.com/dask/distributed.git --upgrade COPY ./setup-slave.sh / COPY ./*.sh /