From 809ecfa1f3c583d35d6d5d643c4d4a3efb4d739c Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Fri, 15 Oct 2021 10:44:34 +0200 Subject: [PATCH 01/14] testing channels --- build_tools/azure/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index a15ce3657f6f6..5cfff2b40dcf7 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -16,7 +16,8 @@ make_conda() { if [[ "$DISTRIB" == *"mamba"* ]]; then mamba create -n $VIRTUALENV --yes $TO_INSTALL else - conda create -n $VIRTUALENV --yes $TO_INSTALL + conda config --show + conda create --override-channels -c conda-forge -n $VIRTUALENV --yes $TO_INSTALL fi source activate $VIRTUALENV } From f427b211098f1dd611f21b912bf04eedcb266562 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Fri, 15 Oct 2021 10:55:36 +0200 Subject: [PATCH 02/14] move to matplotlib 2.2.3 since 2.2.2 is not available on conda-forge --- sklearn/_min_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/_min_dependencies.py b/sklearn/_min_dependencies.py index 85a5d8555ae1e..bee904fffa558 100644 --- a/sklearn/_min_dependencies.py +++ b/sklearn/_min_dependencies.py @@ -25,7 +25,7 @@ "joblib": (JOBLIB_MIN_VERSION, "install"), "threadpoolctl": (THREADPOOLCTL_MIN_VERSION, "install"), "cython": (CYTHON_MIN_VERSION, "build"), - "matplotlib": ("2.2.2", "benchmark, docs, examples, tests"), + "matplotlib": ("2.2.3", "benchmark, docs, examples, tests"), "scikit-image": ("0.14.5", "docs, examples, tests"), "pandas": ("0.25.0", "benchmark, docs, examples, tests"), "seaborn": ("0.9.0", "docs, examples"), From 1880d0bdcd9a2f270c7e085cfe5d93d8f79dc567 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Fri, 15 Oct 2021 11:16:44 +0200 Subject: [PATCH 03/14] change matplotlib min version to 2.2.3 in docs --- README.rst | 2 +- doc/whats_new/v1.0.rst | 2 +- doc/whats_new/v1.1.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 30396dff99c16..b41bb9c98daba 100644 --- a/README.rst +++ b/README.rst @@ -35,7 +35,7 @@ .. |SciPyMinVersion| replace:: 1.1.0 .. |JoblibMinVersion| replace:: 0.11 .. |ThreadpoolctlMinVersion| replace:: 2.0.0 -.. |MatplotlibMinVersion| replace:: 2.2.2 +.. |MatplotlibMinVersion| replace:: 2.2.3 .. |Scikit-ImageMinVersion| replace:: 0.14.5 .. |PandasMinVersion| replace:: 0.25.0 .. |SeabornMinVersion| replace:: 0.9.0 diff --git a/doc/whats_new/v1.0.rst b/doc/whats_new/v1.0.rst index 84a86dc688aa9..35dffba0d994a 100644 --- a/doc/whats_new/v1.0.rst +++ b/doc/whats_new/v1.0.rst @@ -677,7 +677,7 @@ Changelog Dupre la Tour`_. - |Fix| Decrease the numerical default tolerance in the lobpcg call - in :func:`manifold.spectral_embedding` to prevent numerical instability. + in :func:`manifold.spectral_embedding` to prevent numerical instability. :pr:`21194` by :user:`Andrew Knyazev `. :mod:`sklearn.metrics` diff --git a/doc/whats_new/v1.1.rst b/doc/whats_new/v1.1.rst index d75ef4f388110..c4f16f4404963 100644 --- a/doc/whats_new/v1.1.rst +++ b/doc/whats_new/v1.1.rst @@ -16,7 +16,7 @@ Minimal dependencies -------------------- Version 1.1.0 of scikit-learn requires python 3.7+, numpy 1.14.6+ and -scipy 1.1.0+. Optional minimal dependency is matplotlib 2.2.2+. +scipy 1.1.0+. Optional minimal dependency is matplotlib 2.2.3+. Put the changes in their relevant module. From b79a2c0eb4aac8aee4d08a96cebf3ded5305a60b Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Fri, 15 Oct 2021 10:44:34 +0200 Subject: [PATCH 04/14] testing channels --- build_tools/azure/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index a15ce3657f6f6..5cfff2b40dcf7 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -16,7 +16,8 @@ make_conda() { if [[ "$DISTRIB" == *"mamba"* ]]; then mamba create -n $VIRTUALENV --yes $TO_INSTALL else - conda create -n $VIRTUALENV --yes $TO_INSTALL + conda config --show + conda create --override-channels -c conda-forge -n $VIRTUALENV --yes $TO_INSTALL fi source activate $VIRTUALENV } From 9f92c32642021ed212f145cc36aba0f2517477a5 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Fri, 15 Oct 2021 10:55:36 +0200 Subject: [PATCH 05/14] move to matplotlib 2.2.3 since 2.2.2 is not available on conda-forge --- sklearn/_min_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/_min_dependencies.py b/sklearn/_min_dependencies.py index 85a5d8555ae1e..bee904fffa558 100644 --- a/sklearn/_min_dependencies.py +++ b/sklearn/_min_dependencies.py @@ -25,7 +25,7 @@ "joblib": (JOBLIB_MIN_VERSION, "install"), "threadpoolctl": (THREADPOOLCTL_MIN_VERSION, "install"), "cython": (CYTHON_MIN_VERSION, "build"), - "matplotlib": ("2.2.2", "benchmark, docs, examples, tests"), + "matplotlib": ("2.2.3", "benchmark, docs, examples, tests"), "scikit-image": ("0.14.5", "docs, examples, tests"), "pandas": ("0.25.0", "benchmark, docs, examples, tests"), "seaborn": ("0.9.0", "docs, examples"), From 2bfec4eb85806888e1efddc5862c448f2c392de0 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Fri, 15 Oct 2021 11:16:44 +0200 Subject: [PATCH 06/14] change matplotlib min version to 2.2.3 in docs --- README.rst | 2 +- doc/whats_new/v1.0.rst | 2 +- doc/whats_new/v1.1.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 30396dff99c16..b41bb9c98daba 100644 --- a/README.rst +++ b/README.rst @@ -35,7 +35,7 @@ .. |SciPyMinVersion| replace:: 1.1.0 .. |JoblibMinVersion| replace:: 0.11 .. |ThreadpoolctlMinVersion| replace:: 2.0.0 -.. |MatplotlibMinVersion| replace:: 2.2.2 +.. |MatplotlibMinVersion| replace:: 2.2.3 .. |Scikit-ImageMinVersion| replace:: 0.14.5 .. |PandasMinVersion| replace:: 0.25.0 .. |SeabornMinVersion| replace:: 0.9.0 diff --git a/doc/whats_new/v1.0.rst b/doc/whats_new/v1.0.rst index 84a86dc688aa9..35dffba0d994a 100644 --- a/doc/whats_new/v1.0.rst +++ b/doc/whats_new/v1.0.rst @@ -677,7 +677,7 @@ Changelog Dupre la Tour`_. - |Fix| Decrease the numerical default tolerance in the lobpcg call - in :func:`manifold.spectral_embedding` to prevent numerical instability. + in :func:`manifold.spectral_embedding` to prevent numerical instability. :pr:`21194` by :user:`Andrew Knyazev `. :mod:`sklearn.metrics` diff --git a/doc/whats_new/v1.1.rst b/doc/whats_new/v1.1.rst index d75ef4f388110..c4f16f4404963 100644 --- a/doc/whats_new/v1.1.rst +++ b/doc/whats_new/v1.1.rst @@ -16,7 +16,7 @@ Minimal dependencies -------------------- Version 1.1.0 of scikit-learn requires python 3.7+, numpy 1.14.6+ and -scipy 1.1.0+. Optional minimal dependency is matplotlib 2.2.2+. +scipy 1.1.0+. Optional minimal dependency is matplotlib 2.2.3+. Put the changes in their relevant module. From 139fde4e9a24d1292dd2061f2d7779b704ca7785 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Fri, 15 Oct 2021 13:44:00 +0200 Subject: [PATCH 07/14] test scipy 1.2.0 --- README.rst | 2 +- doc/developers/advanced_installation.rst | 2 +- doc/faq.rst | 2 +- doc/whats_new/v1.1.rst | 2 +- pyproject.toml | 2 +- sklearn/_min_dependencies.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index b41bb9c98daba..542f17bd639fc 100644 --- a/README.rst +++ b/README.rst @@ -32,7 +32,7 @@ .. |PythonMinVersion| replace:: 3.7 .. |NumPyMinVersion| replace:: 1.14.6 -.. |SciPyMinVersion| replace:: 1.1.0 +.. |SciPyMinVersion| replace:: 1.2.0 .. |JoblibMinVersion| replace:: 0.11 .. |ThreadpoolctlMinVersion| replace:: 2.0.0 .. |MatplotlibMinVersion| replace:: 2.2.3 diff --git a/doc/developers/advanced_installation.rst b/doc/developers/advanced_installation.rst index f5944d371a550..6db919d1337e0 100644 --- a/doc/developers/advanced_installation.rst +++ b/doc/developers/advanced_installation.rst @@ -103,7 +103,7 @@ runtime: .. note:: - For running on PyPy, PyPy3-v5.10+, Numpy 1.14.0+, and scipy 1.1.0+ + For running on PyPy, PyPy3-v5.10+, Numpy 1.14.0+, and scipy 1.2.0+ are required. For PyPy, only installation instructions with pip apply. Build dependencies diff --git a/doc/faq.rst b/doc/faq.rst index 43ef246594de1..83ac4e2904813 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -193,7 +193,7 @@ Do you support PyPy? In case you didn't know, `PyPy `_ is an alternative Python implementation with a built-in just-in-time compiler. Experimental support for PyPy3-v5.10+ has been added, which requires Numpy 1.14.0+, -and scipy 1.1.0+. +and scipy 1.2.0+. How do I deal with string data (or trees, graphs...)? ----------------------------------------------------- diff --git a/doc/whats_new/v1.1.rst b/doc/whats_new/v1.1.rst index c4f16f4404963..ed05bb7b9cdfe 100644 --- a/doc/whats_new/v1.1.rst +++ b/doc/whats_new/v1.1.rst @@ -16,7 +16,7 @@ Minimal dependencies -------------------- Version 1.1.0 of scikit-learn requires python 3.7+, numpy 1.14.6+ and -scipy 1.1.0+. Optional minimal dependency is matplotlib 2.2.3+. +scipy 1.2.0+. Optional minimal dependency is matplotlib 2.2.3+. Put the changes in their relevant module. diff --git a/pyproject.toml b/pyproject.toml index 3762d2f229f76..33f92c89579b2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ requires = [ # Override oldest-supported-numpy setting because pandas 0.25.0 requires 1.14.6 "numpy==1.14.6; python_version=='3.7' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation != 'PyPy'", - "scipy>=1.1.0", + "scipy>=1.2.0", ] [tool.black] diff --git a/sklearn/_min_dependencies.py b/sklearn/_min_dependencies.py index bee904fffa558..0f2c859438e92 100644 --- a/sklearn/_min_dependencies.py +++ b/sklearn/_min_dependencies.py @@ -9,7 +9,7 @@ else: NUMPY_MIN_VERSION = "1.14.6" -SCIPY_MIN_VERSION = "1.1.0" +SCIPY_MIN_VERSION = "1.2.0" JOBLIB_MIN_VERSION = "0.11" THREADPOOLCTL_MIN_VERSION = "2.0.0" PYTEST_MIN_VERSION = "5.0.1" From ec4598c705dfc4c0043efbbd40aa0a070e4a7b7c Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Fri, 15 Oct 2021 14:15:38 +0200 Subject: [PATCH 08/14] Revert "test scipy 1.2.0" This reverts commit 139fde4e9a24d1292dd2061f2d7779b704ca7785. --- README.rst | 2 +- doc/developers/advanced_installation.rst | 2 +- doc/faq.rst | 2 +- doc/whats_new/v1.1.rst | 2 +- pyproject.toml | 2 +- sklearn/_min_dependencies.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 542f17bd639fc..b41bb9c98daba 100644 --- a/README.rst +++ b/README.rst @@ -32,7 +32,7 @@ .. |PythonMinVersion| replace:: 3.7 .. |NumPyMinVersion| replace:: 1.14.6 -.. |SciPyMinVersion| replace:: 1.2.0 +.. |SciPyMinVersion| replace:: 1.1.0 .. |JoblibMinVersion| replace:: 0.11 .. |ThreadpoolctlMinVersion| replace:: 2.0.0 .. |MatplotlibMinVersion| replace:: 2.2.3 diff --git a/doc/developers/advanced_installation.rst b/doc/developers/advanced_installation.rst index 6db919d1337e0..f5944d371a550 100644 --- a/doc/developers/advanced_installation.rst +++ b/doc/developers/advanced_installation.rst @@ -103,7 +103,7 @@ runtime: .. note:: - For running on PyPy, PyPy3-v5.10+, Numpy 1.14.0+, and scipy 1.2.0+ + For running on PyPy, PyPy3-v5.10+, Numpy 1.14.0+, and scipy 1.1.0+ are required. For PyPy, only installation instructions with pip apply. Build dependencies diff --git a/doc/faq.rst b/doc/faq.rst index 83ac4e2904813..43ef246594de1 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -193,7 +193,7 @@ Do you support PyPy? In case you didn't know, `PyPy `_ is an alternative Python implementation with a built-in just-in-time compiler. Experimental support for PyPy3-v5.10+ has been added, which requires Numpy 1.14.0+, -and scipy 1.2.0+. +and scipy 1.1.0+. How do I deal with string data (or trees, graphs...)? ----------------------------------------------------- diff --git a/doc/whats_new/v1.1.rst b/doc/whats_new/v1.1.rst index ed05bb7b9cdfe..c4f16f4404963 100644 --- a/doc/whats_new/v1.1.rst +++ b/doc/whats_new/v1.1.rst @@ -16,7 +16,7 @@ Minimal dependencies -------------------- Version 1.1.0 of scikit-learn requires python 3.7+, numpy 1.14.6+ and -scipy 1.2.0+. Optional minimal dependency is matplotlib 2.2.3+. +scipy 1.1.0+. Optional minimal dependency is matplotlib 2.2.3+. Put the changes in their relevant module. diff --git a/pyproject.toml b/pyproject.toml index 33f92c89579b2..3762d2f229f76 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ requires = [ # Override oldest-supported-numpy setting because pandas 0.25.0 requires 1.14.6 "numpy==1.14.6; python_version=='3.7' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation != 'PyPy'", - "scipy>=1.2.0", + "scipy>=1.1.0", ] [tool.black] diff --git a/sklearn/_min_dependencies.py b/sklearn/_min_dependencies.py index 0f2c859438e92..bee904fffa558 100644 --- a/sklearn/_min_dependencies.py +++ b/sklearn/_min_dependencies.py @@ -9,7 +9,7 @@ else: NUMPY_MIN_VERSION = "1.14.6" -SCIPY_MIN_VERSION = "1.2.0" +SCIPY_MIN_VERSION = "1.1.0" JOBLIB_MIN_VERSION = "0.11" THREADPOOLCTL_MIN_VERSION = "2.0.0" PYTEST_MIN_VERSION = "5.0.1" From c60c0834d8fea140644fd33c2859c00eaf2fa6b0 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Sat, 16 Oct 2021 17:59:26 +0200 Subject: [PATCH 09/14] Use conda-forge on all Azure builds explicitly --- azure-pipelines.yml | 17 +++++++++++------ build_tools/azure/install.sh | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index def0a8f98ae9b..d729ffd5aa17a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -97,8 +97,9 @@ jobs: ) ) matrix: - pylatest_conda_mkl: + pylatest_conda_forge_mkl: DISTRIB: 'conda' + CONDA_CHANNEL: 'conda-forge' PYTHON_VERSION: '*' BLAS: 'mkl' COVERAGE: 'false' @@ -116,8 +117,9 @@ jobs: not(contains(dependencies['git_commit']['outputs']['commit.message'], '[ci skip]')) ) matrix: - pylatest_conda_mkl: + pylatest_conda_forge_mkl: DISTRIB: 'conda' + CONDA_CHANNEL: 'conda-forge' PYTHON_VERSION: '*' BLAS: 'mkl' COVERAGE: 'true' @@ -135,8 +137,9 @@ jobs: ne(variables['Build.Reason'], 'Schedule') ) matrix: - py37_conda: + py37_conda_forge_openblas_ubuntu_1804: DISTRIB: 'conda' + CONDA_CHANNEL: 'conda-forge' PYTHON_VERSION: '3.7' BLAS: 'openblas' COVERAGE: 'false' @@ -164,8 +167,9 @@ jobs: THREADPOOLCTL_VERSION: 'min' COVERAGE: 'false' # Linux + Python 3.7 build with OpenBLAS and without SITE_JOBLIB - py37_conda_openblas: + py37_conda_forge_openblas: DISTRIB: 'conda' + CONDA_CHANNEL: 'conda-forge' PYTHON_VERSION: '3.7' BLAS: 'openblas' NUMPY_VERSION: 'min' @@ -242,13 +246,14 @@ jobs: ne(variables['Build.Reason'], 'Schedule') ) matrix: - py37_conda_mkl: + py37_conda_forge_mkl: + DISTRIB: 'conda' + CONDA_CHANNEL: 'conda-forge' PYTHON_VERSION: '3.7' CHECK_WARNINGS: 'true' PYTHON_ARCH: '64' PYTEST_VERSION: '*' COVERAGE: 'true' - DISTRIB: 'conda' py37_pip_openblas_32bit: PYTHON_VERSION: '3.7' PYTHON_ARCH: '32' diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index 810c86490db32..5bd845147b0f3 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -17,7 +17,7 @@ make_conda() { mamba create -n $VIRTUALENV --yes $TO_INSTALL else conda config --show - conda create --override-channels -c conda-forge -n $VIRTUALENV --yes $TO_INSTALL + conda create -n $VIRTUALENV --yes $TO_INSTALL fi source activate $VIRTUALENV } @@ -39,7 +39,7 @@ source build_tools/shared.sh if [[ "$DISTRIB" == "conda" || "$DISTRIB" == *"mamba"* ]]; then if [[ "$CONDA_CHANNEL" != "" ]]; then - TO_INSTALL="-c $CONDA_CHANNEL" + TO_INSTALL="--override-channels -c $CONDA_CHANNEL" else TO_INSTALL="" fi From 931acd285adbaf3a88c8e6594df430beef71a3a7 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Sat, 16 Oct 2021 19:01:21 +0200 Subject: [PATCH 10/14] MAINT display more runtime info before launching tests --- build_tools/azure/test_script.sh | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/build_tools/azure/test_script.sh b/build_tools/azure/test_script.sh index 6e05d7d858e52..15fd8022f85f2 100755 --- a/build_tools/azure/test_script.sh +++ b/build_tools/azure/test_script.sh @@ -12,18 +12,16 @@ if [[ "$BUILD_WITH_ICC" == "true" ]]; then source /opt/intel/oneapi/setvars.sh fi -python --version -python -c "import numpy; print('numpy %s' % numpy.__version__)" -python -c "import scipy; print('scipy %s' % scipy.__version__)" -python -c "\ -try: - import pandas - print('pandas %s' % pandas.__version__) -except ImportError: - print('pandas not installed') -" -python -c "import multiprocessing as mp; print('%d CPUs' % mp.cpu_count())" -pip list +python -c "import sklearn; sklearn.show_versions()" +python -m threadpoolctl -i sklearn + +if ! command -v conda &> /dev/null +then + pip list +else + # conda list provides more info than pip list (when available) + conda list +fi TEST_CMD="python -m pytest --showlocals --durations=20 --junitxml=$JUNITXML" From fd6f0d81ffdc64fe9dc85f806d7f9a759ac60a11 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Sun, 17 Oct 2021 01:29:41 +0200 Subject: [PATCH 11/14] Introspect python runtime from outside of the scikit-learn source folder --- build_tools/azure/test_script.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build_tools/azure/test_script.sh b/build_tools/azure/test_script.sh index 15fd8022f85f2..8e8110bcaef04 100755 --- a/build_tools/azure/test_script.sh +++ b/build_tools/azure/test_script.sh @@ -12,6 +12,10 @@ if [[ "$BUILD_WITH_ICC" == "true" ]]; then source /opt/intel/oneapi/setvars.sh fi +mkdir -p $TEST_DIR +cp setup.cfg $TEST_DIR +cd $TEST_DIR + python -c "import sklearn; sklearn.show_versions()" python -m threadpoolctl -i sklearn @@ -44,10 +48,6 @@ if [[ "$PYTEST_XDIST_VERSION" != "none" ]]; then TEST_CMD="$TEST_CMD -n2" fi -mkdir -p $TEST_DIR -cp setup.cfg $TEST_DIR -cd $TEST_DIR - set -x $TEST_CMD --pyargs sklearn set +x From 9f98d338ab4d171eb66d582ef5f820ee66d3d1b4 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Sun, 17 Oct 2021 01:36:50 +0200 Subject: [PATCH 12/14] Use a slightly more recent version of threadpoolctl to debug segfault env --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d729ffd5aa17a..f051b896f5eb6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -175,7 +175,7 @@ jobs: NUMPY_VERSION: 'min' SCIPY_VERSION: 'min' MATPLOTLIB_VERSION: 'min' - THREADPOOLCTL_VERSION: '2.0.0' + THREADPOOLCTL_VERSION: '2.2.0' # Linux environment to test the latest available dependencies and MKL. # It runs tests requiring lightgbm, pandas and PyAMG. pylatest_pip_openblas_pandas: @@ -210,7 +210,7 @@ jobs: # disable pytest xdist due to unknown bug with 32-bit container PYTEST_XDIST_VERSION: 'none' PYTEST_VERSION: 'min' - THREADPOOLCTL_VERSION: 'min' + THREADPOOLCTL_VERSION: '2.2.0' - template: build_tools/azure/posix.yml parameters: From 68b1cd85643b1328e2c7f2be4eca6f35f679230f Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 18 Oct 2021 11:19:06 +0200 Subject: [PATCH 13/14] MNT switch back to main channel for segfault --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f051b896f5eb6..5b455b92d0bb0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -167,9 +167,9 @@ jobs: THREADPOOLCTL_VERSION: 'min' COVERAGE: 'false' # Linux + Python 3.7 build with OpenBLAS and without SITE_JOBLIB - py37_conda_forge_openblas: + py37_conda_default_openblas: DISTRIB: 'conda' - CONDA_CHANNEL: 'conda-forge' + CONDA_CHANNEL: 'defaults' # Anaconda main channel PYTHON_VERSION: '3.7' BLAS: 'openblas' NUMPY_VERSION: 'min' From c740e359249d5a7b4ce70e4496dcb6e5acf2e152 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 18 Oct 2021 12:19:33 +0200 Subject: [PATCH 14/14] Apply suggestions from code review Co-authored-by: Olivier Grisel --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5b455b92d0bb0..19bc8b4efe4df 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -167,7 +167,7 @@ jobs: THREADPOOLCTL_VERSION: 'min' COVERAGE: 'false' # Linux + Python 3.7 build with OpenBLAS and without SITE_JOBLIB - py37_conda_default_openblas: + py37_conda_defaults_openblas: DISTRIB: 'conda' CONDA_CHANNEL: 'defaults' # Anaconda main channel PYTHON_VERSION: '3.7'