Skip to content

Commit

Permalink
Miscellaneous joblib updates (#545)
Browse files Browse the repository at this point in the history
* Use joblib directly in benchmark

As joblib contains the needed functionality here and has done so for a
while, go ahead and import from joblib directly instead of
scikit-learn's vendored joblib, which will soon be removed.

* Drop import of `distributed.joblib`

This just generates an `ImportError` as of distributed 1.24.0.

* Drop import of `dask_ml.joblib`

This just propagates an `ImportError` as of distributed 1.24.0.
  • Loading branch information
jakirkham authored and TomAugspurger committed Sep 17, 2019
1 parent 048f5d0 commit 17dcaef
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 150 deletions.
2 changes: 1 addition & 1 deletion ci/environment-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies:
- pytest-mock
- python=3.6.6
- sortedcontainers
- scikit-learn>=0.20.0
- scikit-learn>=0.21.3
- scipy
- sparse
- sphinx==1.8.5
Expand Down
1 change: 0 additions & 1 deletion dask_ml/joblib.py

This file was deleted.

148 changes: 0 additions & 148 deletions docs/bench.py

This file was deleted.

0 comments on commit 17dcaef

Please sign in to comment.