From 4210c4e896442c460105aec89cad76fd82875230 Mon Sep 17 00:00:00 2001 From: Jan Tilly Date: Thu, 1 Jun 2023 16:14:50 +0200 Subject: [PATCH 1/2] Pin llvm-openmp. --- CHANGELOG.rst | 1 + build_tools/prepare_macos_wheel.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e94232d2..47516c60 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,7 @@ Changelog **Other changes:** - Remove dev dependency on ``dask_ml``. +- We now pin ``llvm-openmp=11`` when creating the wheel for macOS in line with what scikit-learn does. 2.5.1 - 2023-05-19 diff --git a/build_tools/prepare_macos_wheel.sh b/build_tools/prepare_macos_wheel.sh index a966289a..beff2921 100644 --- a/build_tools/prepare_macos_wheel.sh +++ b/build_tools/prepare_macos_wheel.sh @@ -9,5 +9,5 @@ else CONDA_CHANNEL="conda-forge/osx-64" fi -conda create -n build -c $CONDA_CHANNEL llvm-openmp +conda create -n build -c $CONDA_CHANNEL 'llvm-openmp=11' From 7af3ef8404bdee6459c4e1103d8a4ce2f01dc7e8 Mon Sep 17 00:00:00 2001 From: Jan Tilly Date: Fri, 2 Jun 2023 08:12:48 +0200 Subject: [PATCH 2/2] Bump date in changelog. --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 09f0eb7a..a1e29017 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,7 +7,7 @@ Changelog ========= -2.5.2 - UNRELEASED +2.5.2 - 2023-06-02 ------------------ **Bug fix**