[DOC] update changelog and git blame ignore

.git-blame-ignore-revs

@@ -1,42 +1,74 @@
+# Run this command to always ignore formatting commits in git blame
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
 # ---------------------------------------------------------------------------- #
-#                               FORMATTING PRs
+#                             REFACTORING PRs
 #
-# Most recent PRs are at the top
+# Most recently merged PRs are at the top
 #
 # ---------------------------------------------------------------------------- #
-# [MAINT] Format nilearn/glm: apply isort and fix flake8 errors (#3640)
+# refactor nilearn/maskers (sourcery, f-strings) (#3685)
+37333f4604488ccef0ace5870ad442b725f60860
+# refactor nilearn/glm (sourcery, f-strings) (#3672)
+3522d9086eb9999d05549fc2ad0d13a83c590f8c
+# refactor nilearn/surface (sourcery, f-strings) (#3682)
+9352506d7d32fa17cc83971b011ad00932befe56
+# refactor nilearn/interfaces (sourcery, f-strings) (#3683)
+2e18c91342b65048307a21a45b5a8473414b6d16
+# ---------------------------------------------------------------------------- #
+#                             FORMATTING PRs
+#
+# Most recently merged PRs are at the top
+#
+# ---------------------------------------------------------------------------- #
+# run isort and flake8 on the whole nilearn code base in CI (#3651)
+44933309ecd09add795ce1c3ea5edaab4294da87
+# Format nilearn/plotting: apply isort and fix flake8 errors (#3648)
+115816702222182a244414540bb74687d7ea9597
+# Update config for formatting of nilearn/datasets (#3697)
+54aed7305f75be38d52d15ed30f80f45bfdd839f
+# Format datasets/atlas.py (#3694)
+983accf6d83983bae261143d311b2a9b10374d3a
+# Formatting _utils (#3614)
+9a507162952e8598c1281bfdd1b86f6d6ad14425
+# Format reporting (#3615)
+9ed76218dcef6814030c7473a52ae836d7a9ca7a
+# Format nilearn/surface: apply isort and fix flake8 errors (#3645)
+17d4b53d2bdb3a7722530eef9be1d58b305c9a0d
+# apply to black nilearn/glm (#3662)
+a9e13a62f4cbc9eddc4f789ee46c2e096c921f03
+# Format nilearn/glm: apply isort and fix flake8 errors (#3640)
 1c334c9f2bfc5f2f5057489ea199aee483b8874d
-# [MAINT] Format nilearn/interfaces: apply isort and fix flake8 errors (#3647)
+# Format nilearn/interfaces: apply isort and fix flake8 errors (#3647)
 32787d285228dc6c741198ed56d4a6af89445489
-# [MAINT] Format nilearn/maskers: apply isort and fix flake8 errors (#3650)
+# Format nilearn/maskers: apply isort and fix flake8 errors (#3650)
 d15ae59eb181f9980934452f9595d0625681c955
-# [MAINT] Format nilearn/input_data (#3646)
+# Format nilearn/input_data (#3646)
 4a0808b8ef3fe8da1a1e6f910725dacf11e21edd
-# [MAINT] Format files in nilearn folder (#3609)
+# Format files in nilearn folder (#3609)
 d5f11821da6c8852712a5d105d0afb478a04790f
-# [MAINT] Format mass univariate module (#3601)
+# Format mass univariate module (#3601)
 d5dd4ed4b402e0918ac791b20716db05ce14280f
-# [FMT] clean example/07_advanced and fix remaining style issues in examples (#3556)
+# clean example/07_advanced and fix remaining style issues in examples (#3556)
 6cf7b0e0a897d8b5f16d81d3831103af1123130b
-# [FMT] format image module (#3548)
+# format image module (#3548)
 92c9bf1e5ced1e9062576bfcc846bee4d20598cc
-# [FMT] format example/03_connectivity (#3552)
+# format example/03_connectivity (#3552)
 48fb614ca9ebf99635c78598d5b748080f67fb4d
-# [FMT] format example/02_decoding (#3551)
+# format example/02_decoding (#3551)
 1c87dc98574774f62da632284442a4056f77fea1
-# [MAINT] Apply precommit hooks to doc (#3566)
+# Apply precommit hooks to doc (#3566)
 5ddc12b585d8bd956df5e8f89c8d9d2ca37bc981
-# [FMT] format example/04_glm_first_level (#3553)
+# format example/04_glm_first_level (#3553)
 946440c527a077dc759d76bce7964dad18cd6b13
-# [FMT] format example/01_plotting (#3550)
+# format example/01_plotting (#3550)
 686a7debd73e746c282d8111d24343abb5c19d34
-# [FMT] format example/00_tutorials (#3549)
+# format example/00_tutorials (#3549)
 859a2b5141fc36fc01c402bdd3152683feab82e4
-# [MAINT] start applying isort to organize imports (#3538)
+# start applying isort to organize imports (#3538)
 bf2eb514acf75f338b28164563f6023d762fc95b
-# [MAINT] apply pre-commit to root files (#3533)
+# apply pre-commit to root files (#3533)
 f6db5d424cfb794dd9cf4ea93d8319e5fbc4565b
-# [INFRA] apply black, flake8, pyupgrade to `nilearn/decoding` (#3491)
+# apply black, flake8, pyupgrade to nilearn/decoding (#3491)
 f62e896234e389c9579bbf41b3c2531111cc6371
-# [INFRA] Initial formatting with black and precommit (#3484)
-77c1d785df4995166ea0a6798bc756f58f172812 
+# Initial formatting with black and precommit (#3484)
+77c1d785df4995166ea0a6798bc756f58f172812

.pre-commit-config.yaml

@@ -12,6 +12,7 @@ files: |
         | .*toml
         | .*yaml
         | .*yml
+        | \.git-blame.*
         | AUTHORS.rst
         | CONTRIBUTING.rst
         | LICENSE

doc/changes/latest.rst

@@ -12,6 +12,7 @@ Fixes
 -----
 
 - Fix bug in :func:`~glm.first_level.first_level_from_bids` that returned no confound files if the corresponding bold files contained derivatives BIDS entities (:gh:`3742` by `Rémi Gau`_).
+
 - :bdg-dark:`Code` Fix bug where the `cv_params_` attribute of fitter Decoder objects sometimes had missing entries if `grid_param` is a sequence of dicts with different keys (:gh:`3733` by `Michelle Wang`_).
 
 Enhancements
@@ -23,3 +24,5 @@ Changes
 -------
 
 - Removed old files and test code from deprecated datasets COBRE and NYU resting state (:gh:`3743` by `Michelle Wang`_).
+
+- :bdg-secondary:`Maint` PEP8 and isort compliance extended to the whole nilearn codebase. (:gh:`3538`, :gh:`3566`, :gh:`3548`, :gh:`3556`, :gh:`3601`, :gh:`3609`, :gh:`3646`, :gh:`3650`, :gh:`3647`, :gh:`3640`, :gh:`3615`, :gh:`3614`, :gh:`3648`,  :gh:`#3651`  by `Rémi Gau`_).