scikit-learn · rth · Jun 12, 2021 · Dec 11, 2020 · Jun 12, 2021 · Jun 12, 2021
diff --git a/benchmarks/bench_plot_fastkmeans.py b/benchmarks/bench_plot_fastkmeans.py
@@ -90,7 +90,7 @@ def compute_bench_2(chunks):
 
 
 if __name__ == '__main__':
-    from mpl_toolkits.mplot3d import axes3d  # register the 3d projection
+    from mpl_toolkits.mplot3d import axes3d  # noqa register the 3d projection
     import matplotlib.pyplot as plt
 
     samples_range = np.linspace(50, 150, 5).astype(int)

diff --git a/benchmarks/bench_plot_lasso_path.py b/benchmarks/bench_plot_lasso_path.py
@@ -32,7 +32,7 @@ def compute_bench(samples_range, features_range):
                 'n_features': n_features,
                 'n_informative': n_features // 10,
                 'effective_rank': min(n_samples, n_features) / 10,
-                #'effective_rank': None,
+                # 'effective_rank': None,
                 'bias': 0.0,
             }
             print("n_samples: %d" % n_samples)
@@ -81,7 +81,7 @@ def compute_bench(samples_range, features_range):
 
 
 if __name__ == '__main__':
-    from mpl_toolkits.mplot3d import axes3d  # register the 3d projection
+    from mpl_toolkits.mplot3d import axes3d  # noqa register the 3d projection
     import matplotlib.pyplot as plt
 
     samples_range = np.linspace(10, 2000, 5).astype(int)

diff --git a/benchmarks/bench_plot_randomized_svd.py b/benchmarks/bench_plot_randomized_svd.py
@@ -239,7 +239,7 @@ def svd_timing(X, n_comps, n_iter, n_oversamples,
     Measure time for decomposition
     """
     print("... running SVD ...")
-    if method is not 'fbpca':
+    if method != 'fbpca':
         gc.collect()
         t0 = time()
         U, mu, V = randomized_svd(X, n_comps, n_oversamples, n_iter,

diff --git a/benchmarks/bench_plot_svd.py b/benchmarks/bench_plot_svd.py
@@ -54,7 +54,7 @@ def compute_bench(samples_range, features_range, n_iter=3, rank=50):
 
 
 if __name__ == '__main__':
-    from mpl_toolkits.mplot3d import axes3d  # register the 3d projection
+    from mpl_toolkits.mplot3d import axes3d  # noqa register the 3d projection
     import matplotlib.pyplot as plt
 
     samples_range = np.linspace(2, 1000, 4).astype(int)

diff --git a/benchmarks/bench_rcv1_logreg_convergence.py b/benchmarks/bench_rcv1_logreg_convergence.py
@@ -39,7 +39,7 @@ def bench_one(name, clf_type, clf_params, n_iter):
     clf = clf_type(**clf_params)
     try:
         clf.set_params(max_iter=n_iter, random_state=42)
-    except:
+    except Exception:
         clf.set_params(n_iter=n_iter, random_state=42)
 
     st = time.time()
@@ -48,12 +48,12 @@ def bench_one(name, clf_type, clf_params, n_iter):
 
     try:
         C = 1.0 / clf.alpha / n_samples
-    except:
+    except Exception:
         C = clf.C
 
     try:
         intercept = clf.intercept_
-    except:
+    except Exception:
         intercept = 0.
 
     train_loss = get_loss(clf.coef_, intercept, X, y, C)

diff --git a/pyproject.toml b/pyproject.toml
@@ -16,3 +16,28 @@ requires = [
 
     "scipy>=1.1.0",
 ]
+
+[tool.black]
+line-length = 88
+exclude = '''
+
+(
+  /(
+      \.eggs         # exclude a few common directories in the
+    | \.git          # root of the project
+    | \.mypy_cache
+    | examples
+    | build
+    | dist
+    | doc
+    | sklearn/externals
+  )/
+)
+'''
+include = '''
+(
+  /(
+      doc/conf.py
+  )/
+)
+'''
diff --git a/setup.cfg b/setup.cfg
@@ -26,8 +26,31 @@ artifact_indexes=
     https://pypi.anaconda.org/scikit-learn-wheels-staging/simple/scikit-learn/
 
 [flake8]
+# max line length for black
+max-line-length = 88
+target-version = ['py37']
 # Default flake8 3.5 ignored flags
-ignore=E121,E123,E126,E226,E24,E704,W503,W504
+ignore=
+    E24,   # check ignored by default in flake8. Meaning unclear.
+    E121,  # continuation line under-indented
+    E123,  # closing bracket does not match indentation
+    E126,  # continuation line over-indented for hanging indent
+    E203,  # space before : (needed for how black formats slicing)
+    E226,  # missing whitespace around arithmetic operator
+    E704,  # multiple statements on one line (def)
+    E731,  # do not assign a lambda expression, use a def
+    E741,  # do not use variables named ‘l’, ‘O’, or ‘I’
+    W503,  # line break before binary operator
+    W504   # line break after binary operator
+exclude=
+    .git,
+    __pycache__,
+    dist,
+    sklearn/externals,
+    doc/_build,
+    doc/auto_examples,
+    doc/tutorial
+
 # It's fine not to put the import at the top of the file in the examples
 # folder.
 per-file-ignores =

diff --git a/setup.py b/setup.py
@@ -48,7 +48,7 @@
 
 # We can actually import a restricted version of sklearn that
 # does not need the compiled code
-import sklearn
+import sklearn  # noqa
 import sklearn._min_dependencies as min_deps  # noqa
 from sklearn.externals._packaging.version import parse as parse_version  # noqa
 

diff --git a/sklearn/calibration.py b/sklearn/calibration.py
@@ -382,7 +382,7 @@ def _more_tags(self):
         return {
             '_xfail_checks': {
                 'check_sample_weights_invariance':
-                'zero sample_weight is not equivalent to removing samples',
+                ('zero sample_weight is not equivalent to removing samples'),
             }
         }
 

diff --git a/sklearn/cluster/_affinity_propagation.py b/sklearn/cluster/_affinity_propagation.py
@@ -371,8 +371,9 @@ def __init__(self, *, damping=.5, max_iter=200, convergence_iter=15,
 
     # TODO: Remove in 1.1
     # mypy error: Decorated property not supported
-    @deprecated("Attribute _pairwise was deprecated in "  # type: ignore
-                "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "Attribute _pairwise was deprecated in "
+        "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
     @property
     def _pairwise(self):
         return self.affinity == "precomputed"

diff --git a/sklearn/cluster/_kmeans.py b/sklearn/cluster/_kmeans.py
@@ -1227,7 +1227,7 @@ def _more_tags(self):
         return {
             '_xfail_checks': {
                 'check_sample_weights_invariance':
-                'zero sample_weight is not equivalent to removing samples',
+                ('zero sample_weight is not equivalent to removing samples'),
             },
         }
 
@@ -1530,20 +1530,23 @@ def __init__(self, n_clusters=8, *, init='k-means++', max_iter=100,
         self.init_size = init_size
         self.reassignment_ratio = reassignment_ratio
 
-    @deprecated("The attribute 'counts_' is deprecated in 0.24"  # type: ignore
-                " and will be removed in 1.1 (renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "The attribute 'counts_' is deprecated in 0.24"
+        " and will be removed in 1.1 (renaming of 0.26).")
     @property
     def counts_(self):
         return self._counts
 
-    @deprecated("The attribute 'init_size_' is deprecated in "  # type: ignore
-                "0.24 and will be removed in 1.1 (renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "The attribute 'init_size_' is deprecated in "
+        "0.24 and will be removed in 1.1 (renaming of 0.26).")
     @property
     def init_size_(self):
         return self._init_size
 
-    @deprecated("The attribute 'random_state_' is deprecated "  # type: ignore
-                "in 0.24 and will be removed in 1.1 (renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "The attribute 'random_state_' is deprecated "
+        "in 0.24 and will be removed in 1.1 (renaming of 0.26).")
     @property
     def random_state_(self):
         return getattr(self, "_random_state", None)
@@ -1923,6 +1926,6 @@ def _more_tags(self):
         return {
             '_xfail_checks': {
                 'check_sample_weights_invariance':
-                'zero sample_weight is not equivalent to removing samples',
+                ('zero sample_weight is not equivalent to removing samples'),
             }
         }
diff --git a/sklearn/cluster/_spectral.py b/sklearn/cluster/_spectral.py
@@ -592,8 +592,9 @@ def _more_tags(self):
 
     # TODO: Remove in 1.1
     # mypy error: Decorated property not supported
-    @deprecated("Attribute _pairwise was deprecated in "  # type: ignore
-                "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "Attribute _pairwise was deprecated in "
+        "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
     @property
     def _pairwise(self):
         return self.affinity in ["precomputed",

diff --git a/sklearn/decomposition/_dict_learning.py b/sklearn/decomposition/_dict_learning.py
@@ -1101,9 +1101,10 @@ def fit(self, X, y=None):
         """
         return self
 
-    @deprecated("The attribute 'components_' is deprecated "  # type: ignore
-                "in 0.24 and will be removed in 1.1 (renaming of 0.26). Use "
-                "the 'dictionary' instead.")
+    @deprecated(  # type: ignore
+        "The attribute 'components_' is deprecated "
+        "in 0.24 and will be removed in 1.1 (renaming of 0.26). Use the "
+        "'dictionary' instead.")
     @property
     def components_(self):
         return self.dictionary

diff --git a/sklearn/decomposition/_kernel_pca.py b/sklearn/decomposition/_kernel_pca.py
@@ -224,8 +224,9 @@ def __init__(self, n_components=None, *, kernel="linear",
 
     # TODO: Remove in 1.1
     # mypy error: Decorated property not supported
-    @deprecated("Attribute _pairwise was deprecated in "  # type: ignore
-                "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "Attribute _pairwise was deprecated in "
+        "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
     @property
     def _pairwise(self):
         return self.kernel == "precomputed"

diff --git a/sklearn/ensemble/_gb.py b/sklearn/ensemble/_gb.py
@@ -1766,9 +1766,9 @@ def apply(self, X):
 
     # FIXME: to be removed in 1.1
     # mypy error: Decorated property not supported
-    @deprecated("Attribute n_classes_ was deprecated "  # type: ignore
-                "in version 0.24 and will be removed in 1.1 "
-                "(renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "Attribute n_classes_ was deprecated "
+        "in version 0.24 and will be removed in 1.1 (renaming of 0.26).")
     @property
     def n_classes_(self):
         try:

diff --git a/sklearn/ensemble/_iforest.py b/sklearn/ensemble/_iforest.py
@@ -468,7 +468,7 @@ def _more_tags(self):
         return {
             '_xfail_checks': {
                 'check_sample_weights_invariance':
-                'zero sample_weight is not equivalent to removing samples',
+                ('zero sample_weight is not equivalent to removing samples'),
             }
         }
 

diff --git a/sklearn/kernel_approximation.py b/sklearn/kernel_approximation.py
@@ -854,7 +854,7 @@ def _more_tags(self):
         return {
             '_xfail_checks': {
                 'check_transformer_preserve_dtypes':
-                'dtypes are preserved but not at a close enough precision',
+                ('dtypes are preserved but not at a close enough precision')
             },
             'preserves_dtype': [np.float64, np.float32]
         }
diff --git a/sklearn/kernel_ridge.py b/sklearn/kernel_ridge.py
@@ -141,8 +141,9 @@ def _more_tags(self):
 
     # TODO: Remove in 1.1
     # mypy error: Decorated property not supported
-    @deprecated("Attribute _pairwise was deprecated in "  # type: ignore
-                "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "Attribute _pairwise was deprecated in "
+        "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
     @property
     def _pairwise(self):
         return self.kernel == "precomputed"

diff --git a/sklearn/linear_model/_logistic.py b/sklearn/linear_model/_logistic.py
@@ -2140,6 +2140,6 @@ def _more_tags(self):
         return {
             '_xfail_checks': {
                 'check_sample_weights_invariance':
-                'zero sample_weight is not equivalent to removing samples',
+                ('zero sample_weight is not equivalent to removing samples'),
             }
         }
diff --git a/sklearn/linear_model/_ransac.py b/sklearn/linear_model/_ransac.py
@@ -531,6 +531,6 @@ def _more_tags(self):
         return {
             '_xfail_checks': {
                 'check_sample_weights_invariance':
-                'zero sample_weight is not equivalent to removing samples',
+                ('zero sample_weight is not equivalent to removing samples'),
             }
         }
diff --git a/sklearn/linear_model/_ridge.py b/sklearn/linear_model/_ridge.py
@@ -2004,6 +2004,6 @@ def _more_tags(self):
         return {
             '_xfail_checks': {
                 'check_sample_weights_invariance':
-                'zero sample_weight is not equivalent to removing samples',
+                ('zero sample_weight is not equivalent to removing samples'),
             }
         }
diff --git a/sklearn/linear_model/_stochastic_gradient.py b/sklearn/linear_model/_stochastic_gradient.py
@@ -1103,7 +1103,7 @@ def _more_tags(self):
         return {
             '_xfail_checks': {
                 'check_sample_weights_invariance':
-                'zero sample_weight is not equivalent to removing samples',
+                ('zero sample_weight is not equivalent to removing samples'),
             }
         }
 
@@ -1590,7 +1590,7 @@ def _more_tags(self):
         return {
             '_xfail_checks': {
                 'check_sample_weights_invariance':
-                'zero sample_weight is not equivalent to removing samples',
+                ('zero sample_weight is not equivalent to removing samples'),
             }
         }
 

diff --git a/sklearn/manifold/_mds.py b/sklearn/manifold/_mds.py
@@ -393,8 +393,9 @@ def _more_tags(self):
 
     # TODO: Remove in 1.1
     # mypy error: Decorated property not supported
-    @deprecated("Attribute _pairwise was deprecated in "  # type: ignore
-                "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "Attribute _pairwise was deprecated in "
+        "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
     @property
     def _pairwise(self):
         return self.dissimilarity == "precomputed"

diff --git a/sklearn/manifold/_spectral_embedding.py b/sklearn/manifold/_spectral_embedding.py
@@ -492,8 +492,9 @@ def _more_tags(self):
 
     # TODO: Remove in 1.1
     # mypy error: Decorated property not supported
-    @deprecated("Attribute _pairwise was deprecated in "  # type: ignore
-                "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "Attribute _pairwise was deprecated in "
+        "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
     @property
     def _pairwise(self):
         return self.affinity in ["precomputed",

diff --git a/sklearn/metrics/tests/test_common.py b/sklearn/metrics/tests/test_common.py
@@ -511,14 +511,11 @@ def _require_positive_targets(y1, y2):
 def test_symmetry_consistency():
 
     # We shouldn't forget any metrics
-    assert (SYMMETRIC_METRICS.union(
-        NOT_SYMMETRIC_METRICS, set(THRESHOLDED_METRICS),
-        METRIC_UNDEFINED_BINARY_MULTICLASS) ==
-        set(ALL_METRICS))
-
-    assert (
-        SYMMETRIC_METRICS.intersection(NOT_SYMMETRIC_METRICS) ==
-        set())
+    assert ((SYMMETRIC_METRICS | NOT_SYMMETRIC_METRICS |
+             set(THRESHOLDED_METRICS) | METRIC_UNDEFINED_BINARY_MULTICLASS) ==
+            set(ALL_METRICS))
+
+    assert (SYMMETRIC_METRICS & NOT_SYMMETRIC_METRICS) == set()
 
 
 @pytest.mark.parametrize("name", sorted(SYMMETRIC_METRICS))

diff --git a/sklearn/model_selection/_search.py b/sklearn/model_selection/_search.py
@@ -367,8 +367,9 @@ def _more_tags(self):
 
     # TODO: Remove in 1.1
     # mypy error: Decorated property not supported
-    @deprecated("Attribute _pairwise was deprecated in "  # type: ignore
-                "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
+    @deprecated(  # type: ignore
+        "Attribute _pairwise was deprecated in "
+        "version 0.24 and will be removed in 1.1 (renaming of 0.26).")
     @property
     def _pairwise(self):
         # allows cross-validation to see 'precomputed' metrics

diff --git a/sklearn/model_selection/_validation.py b/sklearn/model_selection/_validation.py
@@ -594,7 +594,7 @@ def _fit_and_score(estimator, X, y, scorer, train, test, verbose,
         else:
             estimator.fit(X_train, y_train, **fit_params)
 
-    except Exception as e:
+    except Exception:
         # Note fit time as time until error
         fit_time = time.time() - start_time
         score_time = 0.0