From 083221ce9ac239ffa48f396dd1b94c037da9d634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 30 Jan 2020 17:46:48 +0100 Subject: [PATCH 1/2] pin pandas in the dask integration test --- ci/docker/conda-python-dask.dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/docker/conda-python-dask.dockerfile b/ci/docker/conda-python-dask.dockerfile index e567fecfd13..caacafb6af8 100644 --- a/ci/docker/conda-python-dask.dockerfile +++ b/ci/docker/conda-python-dask.dockerfile @@ -23,3 +23,6 @@ FROM ${repo}:${arch}-conda-python-${python} ARG dask=latest COPY ci/scripts/install_dask.sh /arrow/ci/scripts/ RUN /arrow/ci/scripts/install_dask.sh ${dask} + +# The Spark tests currently break with pandas >= 1.0 +RUN conda install pandas=0.25.3 \ No newline at end of file From b5cb40eec95c1433cc2c6fb33720c5842b6ef94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 30 Jan 2020 21:14:58 +0100 Subject: [PATCH 2/2] pin pandas depending on dask's version --- ci/docker/conda-python-dask.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/conda-python-dask.dockerfile b/ci/docker/conda-python-dask.dockerfile index caacafb6af8..cf19c05237f 100644 --- a/ci/docker/conda-python-dask.dockerfile +++ b/ci/docker/conda-python-dask.dockerfile @@ -25,4 +25,4 @@ COPY ci/scripts/install_dask.sh /arrow/ci/scripts/ RUN /arrow/ci/scripts/install_dask.sh ${dask} # The Spark tests currently break with pandas >= 1.0 -RUN conda install pandas=0.25.3 \ No newline at end of file +RUN if [ ${dask} == "latest" ]; then conda install pandas=0.25.3; fi \ No newline at end of file