MNT upgrade black version (#28802)

scikit-learn · Apr 10, 2024 · c4c5463 · c4c5463
1 parent d9e932e
commit c4c5463
Show file tree

Hide file tree

Showing 156 changed files with 311 additions and 224 deletions.
diff --git a/.github/scripts/label_title_regex.py b/.github/scripts/label_title_regex.py
@@ -1,5 +1,6 @@
 """Labels PRs based on title. Must be run in a github action with the
 pull_request_target event."""
+
 import json
 import os
 import re

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
     -   id: ruff
         args: ["--fix", "--output-format=full"]
 -   repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.3.0
     hooks:
     -   id: black
 -   repo: https://github.com/pre-commit/mirrors-mypy

diff --git a/benchmarks/bench_glm.py b/benchmarks/bench_glm.py
@@ -4,6 +4,7 @@
 Data comes from a random square matrix.
 
 """
+
 from datetime import datetime
 
 import numpy as np

diff --git a/benchmarks/bench_glmnet.py b/benchmarks/bench_glmnet.py
@@ -16,6 +16,7 @@
 
 In both cases, only 10% of the features are informative.
 """
+
 import gc
 from time import time
 

diff --git a/benchmarks/bench_isotonic.py b/benchmarks/bench_isotonic.py
@@ -10,6 +10,7 @@
 This allows the scaling of the algorithm with the problem size to be
 visualized and understood.
 """
+
 import argparse
 import gc
 from datetime import datetime

diff --git a/benchmarks/bench_kernel_pca_solvers_time_vs_n_components.py b/benchmarks/bench_kernel_pca_solvers_time_vs_n_components.py
@@ -35,6 +35,7 @@
 You can also set `arpack_all=True` to activate arpack solver for large number
 of components (this takes more time).
 """
+
 # Authors: Sylvain MARIE, Schneider Electric
 
 import time

diff --git a/benchmarks/bench_kernel_pca_solvers_time_vs_n_samples.py b/benchmarks/bench_kernel_pca_solvers_time_vs_n_samples.py
@@ -37,6 +37,7 @@
 Solvers comparison benchmark: time vs n_components", where this time the number
 of examples is fixed, and the desired number of components varies.
 """
+
 # Author: Sylvain MARIE, Schneider Electric
 
 import time

diff --git a/benchmarks/bench_lasso.py b/benchmarks/bench_lasso.py
@@ -11,6 +11,7 @@
 
 In both cases, only 10% of the features are informative.
 """
+
 import gc
 from time import time
 

diff --git a/benchmarks/bench_plot_lasso_path.py b/benchmarks/bench_plot_lasso_path.py
@@ -2,6 +2,7 @@
 
 The input data is mostly low rank but is a fat infinite tail.
 """
+
 import gc
 import sys
 from collections import defaultdict

diff --git a/benchmarks/bench_plot_neighbors.py b/benchmarks/bench_plot_neighbors.py
@@ -1,6 +1,7 @@
 """
 Plot the scaling of the nearest neighbors algorithms with k, D, and N
 """
+
 from time import time
 
 import matplotlib.pyplot as plt

diff --git a/benchmarks/bench_plot_nmf.py b/benchmarks/bench_plot_nmf.py
@@ -1,6 +1,7 @@
 """
 Benchmarks of Non-Negative Matrix Factorization
 """
+
 # Authors: Tom Dupre la Tour (benchmark)
 #          Chih-Jen Linn (original projected gradient NMF implementation)
 #          Anthony Di Franco (projected gradient, Python and NumPy port)
@@ -258,8 +259,7 @@ def _fit_transform(self, X, y=None, W=None, H=None, update_H=True):
         if not isinstance(self.max_iter, numbers.Integral) or self.max_iter < 0:
             raise ValueError(
                 "Maximum number of iterations must be a positive "
-                "integer; got (max_iter=%r)"
-                % self.max_iter
+                "integer; got (max_iter=%r)" % self.max_iter
             )
         if not isinstance(self.tol, numbers.Number) or self.tol < 0:
             raise ValueError(
@@ -305,8 +305,7 @@ def _fit_transform(self, X, y=None, W=None, H=None, update_H=True):
         if n_iter == self.max_iter and self.tol > 0:
             warnings.warn(
                 "Maximum number of iteration %d reached. Increase it"
-                " to improve convergence."
-                % self.max_iter,
+                " to improve convergence." % self.max_iter,
                 ConvergenceWarning,
             )
 

diff --git a/benchmarks/bench_plot_omp_lars.py b/benchmarks/bench_plot_omp_lars.py
@@ -3,6 +3,7 @@
 
 The input data is mostly low rank but is a fat infinite tail.
 """
+
 import gc
 import sys
 from time import time

diff --git a/benchmarks/bench_plot_polynomial_kernel_approximation.py b/benchmarks/bench_plot_polynomial_kernel_approximation.py
@@ -38,6 +38,7 @@
 (https://people.cs.rutgers.edu/~farach/pubs/FrequentStream.pdf)
 
 """
+
 # Author: Daniel Lopez-Sanchez <[email protected]>
 # License: BSD 3 clause
 

diff --git a/benchmarks/bench_plot_svd.py b/benchmarks/bench_plot_svd.py
@@ -2,6 +2,7 @@
 
 The data is mostly low rank but is a fat infinite tail.
 """
+
 import gc
 from collections import defaultdict
 from time import time

diff --git a/benchmarks/bench_random_projections.py b/benchmarks/bench_random_projections.py
@@ -6,6 +6,7 @@
 Benchmarks for random projections.
 
 """
+
 import collections
 import gc
 import optparse

diff --git a/benchmarks/bench_saga.py b/benchmarks/bench_saga.py
@@ -3,6 +3,7 @@
 Benchmarks of sklearn SAGA vs lightning SAGA vs Liblinear. Shows the gain
 in using multinomial logistic regression in term of learning time.
 """
+
 import json
 import os
 import time
@@ -118,9 +119,7 @@ def fit_single(
                 # Lightning predict_proba is not implemented for n_classes > 2
                 y_pred = _predict_proba(lr, X)
             score = log_loss(y, y_pred, normalize=False) / n_samples
-            score += 0.5 * alpha * np.sum(lr.coef_**2) + beta * np.sum(
-                np.abs(lr.coef_)
-            )
+            score += 0.5 * alpha * np.sum(lr.coef_**2) + beta * np.sum(np.abs(lr.coef_))
             scores.append(score)
         train_score, test_score = tuple(scores)
 

diff --git a/benchmarks/bench_sample_without_replacement.py b/benchmarks/bench_sample_without_replacement.py
@@ -2,6 +2,7 @@
 Benchmarks for sampling without replacement of integer.
 
 """
+
 import gc
 import operator
 import optparse

diff --git a/benchmarks/bench_text_vectorizers.py b/benchmarks/bench_text_vectorizers.py
@@ -8,6 +8,7 @@
  * psutil (optional, but recommended)
 
 """
+
 import itertools
 import timeit
 

diff --git a/benchmarks/bench_tree.py b/benchmarks/bench_tree.py
@@ -13,6 +13,7 @@
 training set, classify a sample and plot the time taken as a function
 of the number of dimensions.
 """
+
 import gc
 from datetime import datetime
 

diff --git a/benchmarks/bench_tsne_mnist.py b/benchmarks/bench_tsne_mnist.py
@@ -130,7 +130,8 @@ def sanitize(filename):
         try:
             from bhtsne.bhtsne import run_bh_tsne
         except ImportError as e:
-            raise ImportError("""\
+            raise ImportError(
+                """\
 If you want comparison with the reference implementation, build the
 binary from source (https://github.com/lvdmaaten/bhtsne) in the folder
 benchmarks/bhtsne and add an empty `__init__.py` file in the folder:
@@ -140,7 +141,8 @@ def sanitize(filename):
 $ g++ sptree.cpp tsne.cpp tsne_main.cpp -o bh_tsne -O2
 $ touch __init__.py
 $ cd ..
-""") from e
+"""
+            ) from e
 
         def bhtsne(X):
             """Wrapper for the reference lvdmaaten/bhtsne implementation."""

diff --git a/build_tools/generate_authors_table.py b/build_tools/generate_authors_table.py
@@ -6,6 +6,7 @@
 The table should be updated for each new inclusion in the teams.
 Generating the table requires admin rights.
 """
+
 import getpass
 import sys
 import time

diff --git a/build_tools/get_comment.py b/build_tools/get_comment.py
@@ -88,8 +88,7 @@ def get_message(log_file, repo, pr_number, sha, run_id, details, versions):
             "https://scikit-learn.org/dev/developers/contributing.html"
             "#how-to-contribute)) and push the changes. If you already have done "
             "that, please send an empty commit with `git commit --allow-empty` "
-            "and push the changes to trigger the CI.\n\n"
-            + sub_text
+            "and push the changes to trigger the CI.\n\n" + sub_text
         )
 
     message = ""

diff --git a/build_tools/github/check_wheels.py b/build_tools/github/check_wheels.py
@@ -1,5 +1,6 @@
 """Checks that dist/* contains the number of wheels built from the
 .github/workflows/wheels.yml config."""
+
 import sys
 from pathlib import Path
 

diff --git a/build_tools/github/vendor.py b/build_tools/github/vendor.py
@@ -1,6 +1,5 @@
 """Embed vcomp140.dll and msvcp140.dll."""
 
-
 import os
 import os.path as op
 import shutil

diff --git a/build_tools/update_environments_and_lock_files.py b/build_tools/update_environments_and_lock_files.py
@@ -102,7 +102,8 @@ def remove_from(alist, to_remove):
         "folder": "build_tools/azure",
         "platform": "linux-64",
         "channel": "conda-forge",
-        "conda_dependencies": common_dependencies + [
+        "conda_dependencies": common_dependencies
+        + [
             "ccache",
             "pytorch",
             "pytorch-cpu",
@@ -123,7 +124,8 @@ def remove_from(alist, to_remove):
         "folder": "build_tools/azure",
         "platform": "osx-64",
         "channel": "conda-forge",
-        "conda_dependencies": common_dependencies + [
+        "conda_dependencies": common_dependencies
+        + [
             "ccache",
             "compilers",
             "llvm-openmp",
@@ -160,7 +162,8 @@ def remove_from(alist, to_remove):
         "channel": "defaults",
         "conda_dependencies": remove_from(
             common_dependencies, ["pandas", "cython", "pip", "ninja", "meson-python"]
-        ) + ["ccache"],
+        )
+        + ["ccache"],
         "package_constraints": {
             "python": "3.9",
             "blas": "[build=openblas]",
@@ -268,7 +271,8 @@ def remove_from(alist, to_remove):
         "folder": "build_tools/azure",
         "platform": "win-64",
         "channel": "conda-forge",
-        "conda_dependencies": remove_from(common_dependencies, ["pandas", "pyamg"]) + [
+        "conda_dependencies": remove_from(common_dependencies, ["pandas", "pyamg"])
+        + [
             "wheel",
             "pip",
         ],
@@ -284,7 +288,8 @@ def remove_from(alist, to_remove):
         "folder": "build_tools/circle",
         "platform": "linux-64",
         "channel": "conda-forge",
-        "conda_dependencies": common_dependencies_without_coverage + [
+        "conda_dependencies": common_dependencies_without_coverage
+        + [
             "scikit-image",
             "seaborn",
             "memory_profiler",
@@ -324,7 +329,8 @@ def remove_from(alist, to_remove):
         "folder": "build_tools/circle",
         "platform": "linux-64",
         "channel": "conda-forge",
-        "conda_dependencies": common_dependencies_without_coverage + [
+        "conda_dependencies": common_dependencies_without_coverage
+        + [
             "scikit-image",
             "seaborn",
             "memory_profiler",
@@ -353,7 +359,8 @@ def remove_from(alist, to_remove):
         "channel": "conda-forge",
         "conda_dependencies": remove_from(
             common_dependencies_without_coverage, ["pandas", "pyamg"]
-        ) + ["pip", "ccache"],
+        )
+        + ["pip", "ccache"],
         "package_constraints": {
             "python": "3.9",
         },
@@ -460,7 +467,8 @@ def get_package_with_constraint(package_name, build_metadata, uses_pip=False):
 
 
 def get_conda_environment_content(build_metadata):
-    template = environment.from_string("""
+    template = environment.from_string(
+        """
 # DO NOT EDIT: this file is generated from the specification found in the
 # following script to centralize the configuration for CI builds:
 # build_tools/update_environments_and_lock_files.py
@@ -476,7 +484,8 @@ def get_conda_environment_content(build_metadata):
   {% for pip_dep in build_metadata.get('pip_dependencies', []) %}
     - {{ pip_dep | get_package_with_constraint(build_metadata, uses_pip=True) }}
   {% endfor %}
-  {% endif %}""".strip())
+  {% endif %}""".strip()
+    )
     return template.render(build_metadata=build_metadata)
 
 
@@ -532,13 +541,15 @@ def write_all_conda_lock_files(build_metadata_list):
 
 
 def get_pip_requirements_content(build_metadata):
-    template = environment.from_string("""
+    template = environment.from_string(
+        """
 # DO NOT EDIT: this file is generated from the specification found in the
 # following script to centralize the configuration for CI builds:
 # build_tools/update_environments_and_lock_files.py
 {% for pip_dep in build_metadata['pip_dependencies'] %}
 {{ pip_dep | get_package_with_constraint(build_metadata, uses_pip=True) }}
-{% endfor %}""".strip())
+{% endfor %}""".strip()
+    )
     return template.render(build_metadata=build_metadata)
 
 

diff --git a/doc/developers/contributing.rst b/doc/developers/contributing.rst
@@ -257,7 +257,7 @@ how to set up your git repository:
 
    .. prompt:: bash $
 
-        pip install pytest pytest-cov ruff mypy numpydoc black==23.3.0
+        pip install pytest pytest-cov ruff mypy numpydoc black==24.3.0
 
 .. _upstream:
 

diff --git a/doc/sphinxext/doi_role.py b/doc/sphinxext/doi_role.py
@@ -1,17 +1,17 @@
 """
-    doilinks
-    ~~~~~~~~
-    Extension to add links to DOIs. With this extension you can use e.g.
-    :doi:`10.1016/S0022-2836(05)80360-2` in your documents. This will
-    create a link to a DOI resolver
-    (``https://doi.org/10.1016/S0022-2836(05)80360-2``).
-    The link caption will be the raw DOI.
-    You can also give an explicit caption, e.g.
-    :doi:`Basic local alignment search tool <10.1016/S0022-2836(05)80360-2>`.
-
-    :copyright: Copyright 2015  Jon Lund Steffensen. Based on extlinks by
-        the Sphinx team.
-    :license: BSD.
+doilinks
+~~~~~~~~
+Extension to add links to DOIs. With this extension you can use e.g.
+:doi:`10.1016/S0022-2836(05)80360-2` in your documents. This will
+create a link to a DOI resolver
+(``https://doi.org/10.1016/S0022-2836(05)80360-2``).
+The link caption will be the raw DOI.
+You can also give an explicit caption, e.g.
+:doi:`Basic local alignment search tool <10.1016/S0022-2836(05)80360-2>`.
+
+:copyright: Copyright 2015  Jon Lund Steffensen. Based on extlinks by
+    the Sphinx team.
+:license: BSD.
 """
 
 from docutils import nodes, utils

diff --git a/doc/sphinxext/sphinx_issues.py b/doc/sphinxext/sphinx_issues.py
@@ -18,6 +18,7 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
+
 import re
 
 from docutils import nodes, utils

diff --git a/examples/applications/plot_face_recognition.py b/examples/applications/plot_face_recognition.py
@@ -11,6 +11,7 @@
 .. _LFW: http://vis-www.cs.umass.edu/lfw/
 
 """
+
 # %%
 from time import time
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
     Data comes from a random square matrix.
     """
     from datetime import datetime
     import numpy as np
@@ Expand Down @@