Revert "manually merge dask#929"

This reverts commit 54771f3.

Author: stsievert

ci/environment-3.7.yaml

@@ -17,7 +17,7 @@ dependencies:
   - pytest-cov
   - pytest-mock
   - python=3.7.*
-  - scikit-learn==1.0.*
-  - scipy<=1.7.1
+  - scikit-learn>=1.0.0
+  - scipy
   - sparse
-  - toolz
+  - toolz

ci/environment-3.8.yaml

@@ -17,7 +17,7 @@ dependencies:
   - pytest-cov
   - pytest-mock
   - python=3.8.*
-  - scikit-learn==1.0.*
-  - scipy<=1.7.1
+  - scikit-learn>=1.0.0
+  - scipy
   - sparse
-  - toolz
+  - toolz

ci/environment-3.9.yaml

@@ -20,4 +20,4 @@ dependencies:
   - scikit-learn>=1.0.0
   - scipy
   - sparse
-  - toolz
+  - toolz

tests/model_selection/dask_searchcv/test_model_selection_sklearn.py

@@ -458,7 +458,6 @@ def f1_loss(y_true_, y_pred_):
     assert_array_equal(y_pred, y_pred3)
 
 
-@pytest.mark.xfail(reason="will fix soon", strict=False)
 def test_grid_search_precomputed_kernel():
     # Test that grid search works when the input features are given in the
     # form of a precomputed kernel matrix