MAINT: lint, remove extra files

dask · Jun 7, 2019 · e5c8c60 · e5c8c60
1 parent cd38d7c
commit e5c8c60
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 277 deletions.
diff --git a/dask_ml/model_selection/_hyperband.py b/dask_ml/model_selection/_hyperband.py
@@ -5,12 +5,11 @@
 from warnings import warn
 
 import numpy as np
-from sklearn.metrics.scorer import check_scoring
 from sklearn.utils import check_random_state
 from tornado import gen
 
 from ._incremental import BaseIncrementalSearchCV
-from ._successive_halving import SuccessiveHalvingSearchCV, _get_max_iter
+from ._successive_halving import SuccessiveHalvingSearchCV
 
 logger = logging.getLogger(__name__)
 
@@ -471,13 +470,15 @@ def _get_meta(hists, brackets, SHAs, key):
         decisions = {hi["partial_fit_calls"] for h in hist.values() for hi in h}
         if bracket != max(brackets):
             decisions.discard(1)
-        meta_.append({
-            "decisions": sorted(list(decisions)),
-            "n_models": len(hist),
-            "bracket": bracket,
-            "partial_fit_calls": sum(calls.values()),
-            "SuccessiveHalvingSearchCV params": _get_SHA_params(SHAs[bracket]),
-        })
+        meta_.append(
+            {
+                "decisions": sorted(list(decisions)),
+                "n_models": len(hist),
+                "bracket": bracket,
+                "partial_fit_calls": sum(calls.values()),
+                "SuccessiveHalvingSearchCV params": _get_SHA_params(SHAs[bracket]),
+            }
+        )
     meta_ = sorted(meta_, key=lambda x: x["bracket"])
     return meta_, history_
 

diff --git a/tests/model_selection/test_dist_hyperband.py b/tests/model_selection/test_dist_hyperband.py
diff --git a/tests/model_selection/test_hyperband.py b/tests/model_selection/test_hyperband.py
@@ -130,11 +130,7 @@ def _test_mirrors_paper(c, s, a, b):
         assert alg.metadata == alg.metadata_
 
         assert isinstance(alg.metadata["brackets"], list)
-        assert set(alg.metadata.keys()) == {
-            "n_models",
-            "partial_fit_calls",
-            "brackets",
-        }
+        assert set(alg.metadata.keys()) == {"n_models", "partial_fit_calls", "brackets"}
         for bracket in alg.metadata["brackets"]:
             assert set(bracket.keys()) == {
                 "n_models",

diff --git a/tests/model_selection/test_split.py b/tests/model_selection/test_split.py
diff --git a/tests/model_selection/test_successive_halving.py b/tests/model_selection/test_successive_halving.py
@@ -1,13 +1,13 @@
 import numpy as np
+import pytest
 from distributed.utils_test import gen_cluster  # noqa: F401
 from sklearn.datasets import make_classification
 from sklearn.linear_model import SGDClassifier
-import pytest
 
 from dask_ml.model_selection import SuccessiveHalvingSearchCV
 from dask_ml.model_selection._successive_halving import (
-    _get_n_initial_calls,
     _get_max_iter,
+    _get_n_initial_calls,
 )
 
 
@@ -40,6 +40,7 @@ def test_sha_max_iter(n, r):
     (so only one model is obtained at the end, as per the last assert)
 
     """
+
     @gen_cluster(client=True)
     def _test_sha_max_iter(c, s, a, b):
         model = SGDClassifier(tol=1e-3)