Skip to content

Commit

Permalink
Revert "Merge pull request #6255 from markotoplak/avoid-sklearn-1.2.0"
Browse files Browse the repository at this point in the history
This reverts commit 3508d08, reversing
changes made to 0b76a7a.

# Conflicts:
#	conda-recipe/meta.yaml
#	requirements-core.txt
  • Loading branch information
JakaKokosar committed Mar 31, 2023
1 parent b7c3266 commit 9fc253a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements-core.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9fc253a

Please sign in to comment.