From 559031a66b732d2544042557a1558cdf3056b7aa Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 20 Dec 2021 16:03:40 +0100 Subject: [PATCH 01/10] DBG setuptools breakage --- build_tools/azure/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index 5bd845147b0f3..0da1632bf7a5a 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -92,7 +92,7 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then elif [[ "$DISTRIB" == "debian-32" ]]; then apt-get update - apt-get install -y python3-dev python3-numpy python3-scipy python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv python3-pandas ccache + apt-get install -y python3-dev python3-numpy python3-scipy python3-setuptools python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv python3-pandas ccache python3 -m virtualenv --system-site-packages --python=python3 $VIRTUALENV source $VIRTUALENV/bin/activate From 4004d3ca272b20cecb2afcb87ad5f7fd4478915d Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 20 Dec 2021 16:05:33 +0100 Subject: [PATCH 02/10] add debug pip list --- build_tools/azure/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index 0da1632bf7a5a..a519657e3d1fb 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -95,7 +95,9 @@ elif [[ "$DISTRIB" == "debian-32" ]]; then apt-get install -y python3-dev python3-numpy python3-scipy python3-setuptools python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv python3-pandas ccache python3 -m virtualenv --system-site-packages --python=python3 $VIRTUALENV + python -m pip list source $VIRTUALENV/bin/activate + python -m pip list setup_ccache python -m pip install $(get_dep cython $CYTHON_VERSION) \ $(get_dep joblib $JOBLIB_VERSION) From 4643be24d780ed85ad0429c2fcd331ee7ca40e78 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 20 Dec 2021 16:08:01 +0100 Subject: [PATCH 03/10] iter --- build_tools/azure/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index a519657e3d1fb..4cca90b861c66 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -93,6 +93,7 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then elif [[ "$DISTRIB" == "debian-32" ]]; then apt-get update apt-get install -y python3-dev python3-numpy python3-scipy python3-setuptools python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv python3-pandas ccache + python3 -m pip show setuptools python3 -m virtualenv --system-site-packages --python=python3 $VIRTUALENV python -m pip list From be42a2773322ee46ba2dd27054496a321fc83045 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 20 Dec 2021 16:15:15 +0100 Subject: [PATCH 04/10] iter --- build_tools/azure/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index 4cca90b861c66..a519657e3d1fb 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -93,7 +93,6 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then elif [[ "$DISTRIB" == "debian-32" ]]; then apt-get update apt-get install -y python3-dev python3-numpy python3-scipy python3-setuptools python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv python3-pandas ccache - python3 -m pip show setuptools python3 -m virtualenv --system-site-packages --python=python3 $VIRTUALENV python -m pip list From 63dcc8dba17eb78d162cd403852dac29dd7148c7 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 20 Dec 2021 16:22:36 +0100 Subject: [PATCH 05/10] iter --- build_tools/azure/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index a519657e3d1fb..73170716de623 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -95,9 +95,9 @@ elif [[ "$DISTRIB" == "debian-32" ]]; then apt-get install -y python3-dev python3-numpy python3-scipy python3-setuptools python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv python3-pandas ccache python3 -m virtualenv --system-site-packages --python=python3 $VIRTUALENV - python -m pip list + python3 -m pip list source $VIRTUALENV/bin/activate - python -m pip list + python3 -m pip list setup_ccache python -m pip install $(get_dep cython $CYTHON_VERSION) \ $(get_dep joblib $JOBLIB_VERSION) From 27cdff9e27e84cf699fa801d7a5a62d476f87a45 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 20 Dec 2021 16:33:58 +0100 Subject: [PATCH 06/10] iter --- build_tools/azure/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index 73170716de623..1e8db010b937a 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -95,7 +95,6 @@ elif [[ "$DISTRIB" == "debian-32" ]]; then apt-get install -y python3-dev python3-numpy python3-scipy python3-setuptools python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv python3-pandas ccache python3 -m virtualenv --system-site-packages --python=python3 $VIRTUALENV - python3 -m pip list source $VIRTUALENV/bin/activate python3 -m pip list setup_ccache From 704198fe51d956ee4827121639ccf2f3f96b0188 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 20 Dec 2021 16:58:50 +0100 Subject: [PATCH 07/10] iter --- build_tools/azure/install.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index 1e8db010b937a..ed94430d646e2 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -91,12 +91,15 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then $(get_dep joblib $JOBLIB_VERSION) elif [[ "$DISTRIB" == "debian-32" ]]; then + # temporary fix with setuptools 60.0.0 + # see the update there: + # https://github.com/pypa/setuptools/issues/2941 + export SETUPTOOLS_USE_DISTUTILS=stdlib apt-get update - apt-get install -y python3-dev python3-numpy python3-scipy python3-setuptools python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv python3-pandas ccache + apt-get install -y python3-dev python3-numpy python3-scipy python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv python3-pandas ccache python3 -m virtualenv --system-site-packages --python=python3 $VIRTUALENV source $VIRTUALENV/bin/activate - python3 -m pip list setup_ccache python -m pip install $(get_dep cython $CYTHON_VERSION) \ $(get_dep joblib $JOBLIB_VERSION) From c708f0a92ef35f0ac4d9660e0ca7c39f5342dd19 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 20 Dec 2021 17:11:46 +0100 Subject: [PATCH 08/10] iter --- azure-pipelines.yml | 4 ++++ build_tools/azure/install.sh | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2db2aafb8cc95..a29e8f4dc7f7e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -231,6 +231,10 @@ jobs: PYTEST_XDIST_VERSION: 'none' PYTEST_VERSION: 'min' THREADPOOLCTL_VERSION: '2.2.0' + # temporary fix with setuptools 60.0.0 + # see the update there: + # https://github.com/pypa/setuptools/issues/2941 + SETUPTOOLS_USE_DISTUTILS: 'stdlib' - template: build_tools/azure/posix.yml parameters: diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index ed94430d646e2..5bd845147b0f3 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -91,10 +91,6 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then $(get_dep joblib $JOBLIB_VERSION) elif [[ "$DISTRIB" == "debian-32" ]]; then - # temporary fix with setuptools 60.0.0 - # see the update there: - # https://github.com/pypa/setuptools/issues/2941 - export SETUPTOOLS_USE_DISTUTILS=stdlib apt-get update apt-get install -y python3-dev python3-numpy python3-scipy python3-matplotlib libatlas3-base libatlas-base-dev python3-virtualenv python3-pandas ccache From 1a447585c8513195b4358eb58f703b5ffe1e2eab Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 20 Dec 2021 17:25:55 +0100 Subject: [PATCH 09/10] iter --- azure-pipelines.yml | 4 ---- build_tools/azure/posix-docker.yml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a29e8f4dc7f7e..2db2aafb8cc95 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -231,10 +231,6 @@ jobs: PYTEST_XDIST_VERSION: 'none' PYTEST_VERSION: 'min' THREADPOOLCTL_VERSION: '2.2.0' - # temporary fix with setuptools 60.0.0 - # see the update there: - # https://github.com/pypa/setuptools/issues/2941 - SETUPTOOLS_USE_DISTUTILS: 'stdlib' - template: build_tools/azure/posix.yml parameters: diff --git a/build_tools/azure/posix-docker.yml b/build_tools/azure/posix-docker.yml index 3487b4742e2d1..95c40e885ad47 100644 --- a/build_tools/azure/posix-docker.yml +++ b/build_tools/azure/posix-docker.yml @@ -44,6 +44,9 @@ jobs: # Container is detached and sleeping, allowing steps to run commands # in the container. The TEST_DIR is mapped allowing the host to access # the JUNITXML file + # temporary fix with setuptools 60.0.0 by setting SETUPTOOLS_USE_DISTUTILS + # see the update there: + # https://github.com/pypa/setuptools/issues/2941 - script: > docker container run --rm --volume $TEST_DIR:/temp_dir @@ -71,6 +74,7 @@ jobs: -e SKLEARN_SKIP_NETWORK_TESTS=$SKLEARN_SKIP_NETWORK_TESTS -e BLAS=$BLAS -e CPU_COUNT=$CPU_COUNT + -e SETUPTOOLS_USE_DISTUTILS: 'stdlib' $DOCKER_CONTAINER sleep 1000000 displayName: 'Start container' From 41805a9c2805be6d20ac87bd4d76bf796ee484a8 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 20 Dec 2021 17:36:40 +0100 Subject: [PATCH 10/10] iter --- build_tools/azure/posix-docker.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build_tools/azure/posix-docker.yml b/build_tools/azure/posix-docker.yml index 95c40e885ad47..241cd02588b21 100644 --- a/build_tools/azure/posix-docker.yml +++ b/build_tools/azure/posix-docker.yml @@ -32,6 +32,10 @@ jobs: COVERAGE: 'false' TEST_DOCSTRINGS: 'false' BLAS: 'openblas' + # temporary fix with setuptools 60.0.0 by setting SETUPTOOLS_USE_DISTUTILS + # see the update there: + # https://github.com/pypa/setuptools/issues/2941 + SETUPTOOLS_USE_DISTUTILS: 'stdlib' # Set in azure-pipelines.yml DISTRIB: '' DOCKER_CONTAINER: '' @@ -44,9 +48,6 @@ jobs: # Container is detached and sleeping, allowing steps to run commands # in the container. The TEST_DIR is mapped allowing the host to access # the JUNITXML file - # temporary fix with setuptools 60.0.0 by setting SETUPTOOLS_USE_DISTUTILS - # see the update there: - # https://github.com/pypa/setuptools/issues/2941 - script: > docker container run --rm --volume $TEST_DIR:/temp_dir @@ -74,7 +75,7 @@ jobs: -e SKLEARN_SKIP_NETWORK_TESTS=$SKLEARN_SKIP_NETWORK_TESTS -e BLAS=$BLAS -e CPU_COUNT=$CPU_COUNT - -e SETUPTOOLS_USE_DISTUTILS: 'stdlib' + -e SETUPTOOLS_USE_DISTUTILS=$SETUPTOOLS_USE_DISTUTILS $DOCKER_CONTAINER sleep 1000000 displayName: 'Start container'