From 11e2d526eba3ba951b34e59f0f81998d29e7bd30 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 23 Mar 2021 00:05:56 +0300 Subject: [PATCH 1/8] Update test.sh --- .ci/test.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.ci/test.sh b/.ci/test.sh index 701a9b6ba675..7e2b394ec254 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -96,15 +96,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 - -# graphviz must come from conda-forge to avoid this on some linux distros: -# https://github.com/conda-forge/graphviz-feedstock/issues/18 -conda install -q -y \ - -n $CONDA_ENV \ - -c conda-forge \ - python-graphviz \ - xorg-libxau +conda install -q -y -n $CONDA_ENV cloudpickle dask distributed joblib matplotlib numpy pandas psutil pytest python-graphviz scikit-learn scipy if [[ $OS_NAME == "macos" ]] && [[ $COMPILER == "clang" ]]; then # fix "OMP: Error #15: Initializing libiomp5.dylib, but found libomp.dylib already initialized." (OpenMP library conflict due to conda's MKL) From 7ab1d16c929e4eb56f8715527e6d43c5209e6384 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 23 Mar 2021 00:07:30 +0300 Subject: [PATCH 2/8] Update setup.sh --- .ci/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/setup.sh b/.ci/setup.sh index fd6bda6fb746..dda131e3c62b 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -44,6 +44,7 @@ else # Linux libicu66 \ libssl1.1 \ libunwind8 \ + libxau6 \ locales \ netcat \ unzip \ From b4ab96aecac49e1cfd7fc864dff3adfeb16db984 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 23 Mar 2021 00:09:22 +0300 Subject: [PATCH 3/8] 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 3169d2a50280..85f4ffbd3679 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,7 +1,7 @@ trigger: branches: include: - - master + - libxau tags: include: - v* From 4f9096f9b9bbef034d30301c659d812846bcb556 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 23 Mar 2021 00:19:55 +0300 Subject: [PATCH 4/8] Update test.sh --- .ci/test.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.ci/test.sh b/.ci/test.sh index 7e2b394ec254..66745a0b6de5 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -96,7 +96,14 @@ if [[ $TASK == "swig" ]]; then exit 0 fi -conda install -q -y -n $CONDA_ENV cloudpickle dask distributed joblib matplotlib numpy pandas psutil pytest python-graphviz scikit-learn scipy +conda install -q -y -n $CONDA_ENV cloudpickle dask distributed joblib matplotlib numpy pandas psutil pytest scikit-learn scipy + +# graphviz must come from conda-forge to avoid this on some linux distros: +# https://github.com/conda-forge/graphviz-feedstock/issues/18 +conda install -q -y \ + -n $CONDA_ENV \ + -c conda-forge \ + python-graphviz if [[ $OS_NAME == "macos" ]] && [[ $COMPILER == "clang" ]]; then # fix "OMP: Error #15: Initializing libiomp5.dylib, but found libomp.dylib already initialized." (OpenMP library conflict due to conda's MKL) From a5bde02960f549d0373af73de1a07a7f920701a3 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 23 Mar 2021 00:42:26 +0300 Subject: [PATCH 5/8] Update setup.sh --- .ci/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/setup.sh b/.ci/setup.sh index dda131e3c62b..fb633d4cab52 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -44,7 +44,7 @@ else # Linux libicu66 \ libssl1.1 \ libunwind8 \ - libxau6 \ + libxau-dev \ locales \ netcat \ unzip \ From 5d99c1050b911c7e3d0457611aaf5cb05ee0e0b6 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 23 Mar 2021 01:28:16 +0300 Subject: [PATCH 6/8] 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 85f4ffbd3679..3169d2a50280 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,7 +1,7 @@ trigger: branches: include: - - libxau + - master tags: include: - v* From ed4d1824c209337acc4f1939da6312676b03f756 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 23 Mar 2021 01:39:50 +0300 Subject: [PATCH 7/8] Update setup.sh --- .ci/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/setup.sh b/.ci/setup.sh index fb633d4cab52..fa03bbef8ab4 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -45,6 +45,7 @@ else # Linux libssl1.1 \ libunwind8 \ libxau-dev \ + libxrender1 \ locales \ netcat \ unzip \ From 0c72699d75970e8abcf516caaaee001249115de3 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 23 Mar 2021 02:07:32 +0300 Subject: [PATCH 8/8] Update setup.sh --- .ci/setup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/setup.sh b/.ci/setup.sh index fa03bbef8ab4..f013a9b551ce 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -83,6 +83,8 @@ else # Linux apt-get update apt-get install --no-install-recommends -y \ curl \ + libxau-dev \ + libxrender1 \ lsb-release \ software-properties-common if [[ $COMPILER == "clang" ]]; then