Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump sklearn min version to 0.20 #392

Merged
merged 16 commits into from
Oct 8, 2018

Conversation

TomAugspurger
Copy link
Member

Closes #391
Closes #383
Closes #384

Subsumes #389

@@ -65,8 +65,7 @@
__all__ = ["GridSearchCV", "RandomizedSearchCV"]


if SK_VERSION >= packaging.version.parse("0.19.1"):
from sklearn.utils.deprecation import DeprecationDict
if SK_VERSION <= packaging.version.parse("0.21.dev0"):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI @jrbourbeau aaa0b31 has your commit bringing in DeprecationDict, and I updated the logic here. I think the correct behavior is

  1. Include the train-score keys and warn for 0.20.x
  2. Do not include the train-score keys for >=0.21.dev0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I agree with the logic here

@TomAugspurger
Copy link
Member Author

Py36 and sklearn_dev passed earlier.

The py27 build stalled so I restarted it. https://circleci.com/gh/dask/dask-ml/2508?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link

@TomAugspurger
Copy link
Member Author

That passed.

@TomAugspurger TomAugspurger merged commit 76a6482 into dask:master Oct 8, 2018
@TomAugspurger TomAugspurger deleted the bump-sklearn branch October 8, 2018 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants