[MAINT] Format nilearn/plotting: apply isort and fix flake8 errors

.flake8

@@ -27,6 +27,7 @@ max_function_length = 150
 	# W504: line break after binary operator
 per-file-ignores =
 	*/__init__.py: D104
+	*/*/__init__.py: D104
     # - docstrings rules that should not be applied to tests
 	*/tests/*: D100, D101, D102, D103, D104, D205, D400, D401
 	*/*/tests/*: D100, D101, D102, D103, D104, D205, D400, D401

.github/workflows/isort.yml

@@ -42,6 +42,7 @@ jobs:
             nilearn/input_data \
             nilearn/maskers \
             nilearn/mass_univariate \
+            nilearn/plotting \
             nilearn/regions \
             nilearn/rerporting \
             nilearn/surface \

nilearn/conftest.py

@@ -10,6 +10,9 @@
 
 collect_ignore = ["datasets/data/convert_templates.py"]
 
+pytest_plugins = [
+    "nilearn.plotting.tests.test_img_plotting._utils",
+]
 
 try:
     import matplotlib  # noqa: F401
@@ -75,3 +78,19 @@ def close_all():
         import matplotlib.pyplot as plt
 
         plt.close("all")  # takes < 1 us so just always do it
+
+
+MNI_AFFINE = np.array(
+    [
+        [-2.0, 0.0, 0.0, 90.0],
+        [0.0, 2.0, 0.0, -126.0],
+        [0.0, 0.0, 2.0, -72.0],
+        [0.0, 0.0, 0.0, 1.0],
+    ]
+)
+
+
+@pytest.fixture()
+def mni_affine():
+    """Return an affine corresponding to 2mm isotropic MNI template."""
+    return MNI_AFFINE

nilearn/glm/_utils.py

@@ -2,6 +2,7 @@
 
 Authors: Bertrand Thirion, Matthew Brett, Ana Luisa Pinho, 2020
 """
+
 import csv
 from warnings import warn
 

nilearn/plotting/__init__.py

@@ -1,11 +1,8 @@
-"""
-Plotting code for nilearn
-"""
+"""Plotting code for nilearn."""
 # Original Authors: Chris Filo Gorgolewski, Gael Varoquaux
 import importlib
 import warnings
 
-
 OPTIONAL_MATPLOTLIB_MIN_VERSION = "3.3.0"
 
 ###############################################################################
@@ -18,11 +15,14 @@ def _set_mpl_backend():
     except ImportError:
         if importlib.util.find_spec("pytest") is not None:
             from .._utils.testing import skip_if_running_tests
+
             # No need to fail when running tests
             skip_if_running_tests('matplotlib not installed')
         raise
     else:
+
         from .._utils import _compare_version
+
         # When matplotlib was successfully imported we need to check
         # that the version is greater that the minimum required one
         mpl_version = getattr(matplotlib, "__version__", "0.0.0")
@@ -54,19 +54,42 @@ def _set_mpl_backend():
 
 ###############################################################################
 from . import cm
-from .img_plotting import (
-    plot_img, plot_anat, plot_epi, plot_roi, plot_stat_map,
-    plot_glass_brain, plot_connectome, plot_markers, plot_prob_atlas,
-    plot_carpet, plot_img_comparison, show)
-from .find_cuts import find_xyz_cut_coords, find_cut_slices, \
-    find_parcellation_cut_coords, find_probabilistic_atlas_cut_coords
-from .matrix_plotting import (plot_matrix, plot_contrast_matrix,
-                              plot_design_matrix, plot_event)
-from .html_surface import view_surf, view_img_on_surf
-from .html_stat_map import view_img
+from .find_cuts import (
+    find_cut_slices,
+    find_parcellation_cut_coords,
+    find_probabilistic_atlas_cut_coords,
+    find_xyz_cut_coords,
+)
 from .html_connectome import view_connectome, view_markers
-from .surf_plotting import (plot_surf, plot_surf_stat_map, plot_surf_roi,
-                            plot_img_on_surf, plot_surf_contours)
+from .html_stat_map import view_img
+from .html_surface import view_img_on_surf, view_surf
+from .img_plotting import (
+    plot_anat,
+    plot_carpet,
+    plot_connectome,
+    plot_epi,
+    plot_glass_brain,
+    plot_img,
+    plot_img_comparison,
+    plot_markers,
+    plot_prob_atlas,
+    plot_roi,
+    plot_stat_map,
+    show,
+)
+from .matrix_plotting import (
+    plot_contrast_matrix,
+    plot_design_matrix,
+    plot_event,
+    plot_matrix,
+)
+from .surf_plotting import (
+    plot_img_on_surf,
+    plot_surf,
+    plot_surf_contours,
+    plot_surf_roi,
+    plot_surf_stat_map,
+)
 
 __all__ = ['cm', 'plot_img', 'plot_anat', 'plot_epi',
            'plot_roi', 'plot_stat_map', 'plot_glass_brain',