Skip to content

Commit a5a4a10

Browse files
committed
Revert "Merge pull request #6255 from markotoplak/avoid-sklearn-1.2.0"
This reverts commit 3508d08, reversing changes made to 0b76a7a. # Conflicts: # conda-recipe/meta.yaml # requirements-core.txt
1 parent 29b9f17 commit a5a4a10

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ requirements:
4040
- setuptools >=41.0.0
4141
- numpy >=1.19.5
4242
- scipy >=1.9
43-
- scikit-learn >=1.1.0,<1.2.0
43+
- scikit-learn >=1.1.0
4444
- bottleneck >=1.3.4
4545
- chardet >=3.0.2
4646
- xlrd >=1.2.0

requirements-core.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ numpy>=1.19.5
33
scipy>=1.9
44
# scikit-learn version 1.0.0 includes problematic libomp 12 which breaks xgboost
55
# https://github.com/scikit-learn/scikit-learn/pull/21227
6-
scikit-learn>=1.1.0,<1.2.0
6+
scikit-learn>=1.1.0
77
bottleneck>=1.3.4
88
# Reading Excel files
99
xlrd>=1.2.0

0 commit comments

Comments
 (0)