From 9fc253a69923bf44a1310258c8bd68dbf8382592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaka=20Kokos=CC=8Car?= Date: Fri, 31 Mar 2023 10:48:16 +0200 Subject: [PATCH] Revert "Merge pull request #6255 from markotoplak/avoid-sklearn-1.2.0" This reverts commit 3508d08ebf30d5e8c7a6913057bfee9e6391acd7, reversing changes made to 0b76a7a429c41f577fa1f6193179c460b0bd5514. # Conflicts: # conda-recipe/meta.yaml # requirements-core.txt --- conda-recipe/meta.yaml | 2 +- requirements-core.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 56e22c0c050..b23b456dabd 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -40,7 +40,7 @@ requirements: - setuptools >=41.0.0 - numpy >=1.19.5 - scipy >=1.9 - - scikit-learn >=1.1.0,<1.2.0 + - scikit-learn >=1.1.0 - bottleneck >=1.3.4 - chardet >=3.0.2 - xlrd >=1.2.0 diff --git a/requirements-core.txt b/requirements-core.txt index 54e0534016d..e234e008414 100644 --- a/requirements-core.txt +++ b/requirements-core.txt @@ -3,7 +3,7 @@ numpy>=1.19.5 scipy>=1.9 # scikit-learn version 1.0.0 includes problematic libomp 12 which breaks xgboost # https://github.com/scikit-learn/scikit-learn/pull/21227 -scikit-learn>=1.1.0,<1.2.0 +scikit-learn>=1.1.0 bottleneck>=1.3.4 # Reading Excel files xlrd>=1.2.0