From 1b58154849806a6e307f5e5babd3eccd95ea4343 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Thu, 4 Nov 2021 19:07:02 +0300 Subject: [PATCH 1/5] pin Dask version at CI --- .ci/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/test.sh b/.ci/test.sh index e2ba75526edc..59f4922dcc6f 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -114,7 +114,7 @@ if [[ $TASK == "swig" ]]; then exit 0 fi -conda install -q -y -n $CONDA_ENV cloudpickle dask distributed joblib matplotlib numpy pandas psutil pytest scikit-learn scipy +conda install -q -y -n $CONDA_ENV cloudpickle "dask=2021.9.1" "distributed=2021.9.1" joblib matplotlib numpy pandas psutil pytest scikit-learn scipy pip install graphviz # python-graphviz from Anaconda is not allowed to be installed with Python 3.9 if [[ $OS_NAME == "macos" ]] && [[ $COMPILER == "clang" ]]; then From ab44b9a9b0a7808db8ddbb7825ceeafd01cebe40 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Thu, 4 Nov 2021 19:07:18 +0300 Subject: [PATCH 2/5] Update .vsts-ci.yml --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 059ebf9d35b4..e0b247d4ef8b 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,7 +1,7 @@ trigger: branches: include: - - master + - fix_dask tags: include: - v* From 18d385444211d8f74d3ec59aa9b36b035e3ec86d Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Thu, 4 Nov 2021 19:12:22 +0300 Subject: [PATCH 3/5] Update .vsts-ci.yml --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e0b247d4ef8b..059ebf9d35b4 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,7 +1,7 @@ trigger: branches: include: - - fix_dask + - master tags: include: - v* From cb96a71afed12c56cce1e4df8033524d1a393dbc Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Thu, 4 Nov 2021 19:35:12 +0300 Subject: [PATCH 4/5] workaround for Python 3.6 --- .ci/test.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.ci/test.sh b/.ci/test.sh index 59f4922dcc6f..a2f99395402d 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -114,7 +114,14 @@ if [[ $TASK == "swig" ]]; then exit 0 fi -conda install -q -y -n $CONDA_ENV cloudpickle "dask=2021.9.1" "distributed=2021.9.1" joblib matplotlib numpy pandas psutil pytest scikit-learn scipy +# temporary fix for https://github.com/microsoft/LightGBM/issues/4285 +if [[ $PYTHON_VERSION == "3.6" ]]; then + DASK_DEPENDENCIES="dask distributed" +else + DASK_DEPENDENCIES="dask=2021.9.1" "distributed=2021.9.1" +fi + +conda install -q -y -n $CONDA_ENV cloudpickle ${DASK_DEPENDENCIES} joblib matplotlib numpy pandas psutil pytest scikit-learn scipy pip install graphviz # python-graphviz from Anaconda is not allowed to be installed with Python 3.9 if [[ $OS_NAME == "macos" ]] && [[ $COMPILER == "clang" ]]; then From 8d05bded8ee425d08bc52d5a6430497d4e7c7a02 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Thu, 4 Nov 2021 19:40:04 +0300 Subject: [PATCH 5/5] Update test.sh --- .ci/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/test.sh b/.ci/test.sh index a2f99395402d..980b77f81999 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -114,11 +114,11 @@ if [[ $TASK == "swig" ]]; then exit 0 fi -# temporary fix for https://github.com/microsoft/LightGBM/issues/4285 +# temporary fix for https://github.com/microsoft/LightGBM/issues/4769 if [[ $PYTHON_VERSION == "3.6" ]]; then DASK_DEPENDENCIES="dask distributed" else - DASK_DEPENDENCIES="dask=2021.9.1" "distributed=2021.9.1" + DASK_DEPENDENCIES="dask=2021.9.1 distributed=2021.9.1" fi conda install -q -y -n $CONDA_ENV cloudpickle ${DASK_DEPENDENCIES} joblib matplotlib numpy pandas psutil pytest scikit-learn scipy