Merge branch 'main' into black_is_back

nilearn · Aug 18, 2023 · 5027e8e · 5027e8e
2 parents 9d311e8 + fd75801
commit 5027e8e
Show file tree

Hide file tree

Showing 11 changed files with 266 additions and 104 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,7 +17,6 @@ exclude: |
         | examples/04_glm_first_level/plot_localizer_surface_analysis.py
         | examples/07_advanced/plot_surface_bids_analysis.py
         | nilearn/_utils/helpers.py
-        | nilearn/_utils/docs.py
         | nilearn/_utils/data_gen.py
         | nilearn/reporting/html_report.py
         | nilearn/reporting/tests/test_html_report.py

diff --git a/doc/changes/latest.rst b/doc/changes/latest.rst
@@ -44,6 +44,8 @@ Enhancements
 
 - Make return key names in the description file of destrieux surface consistent with :func:`~datasets.fetch_atlas_surf_destrieux` (:gh:`3774` by `Tarun Samanta`_).
 
+- Add ``LassoCV`` as a new estimator option for Decoder objects (:gh: `3781` by `Michelle Wang`_)
+
 Changes
 -------
 

diff --git a/doc/decoding/estimator_choice.rst b/doc/decoding/estimator_choice.rst
@@ -127,6 +127,8 @@ In :class:`nilearn.decoding.DecoderRegressor` you can use some of these objects
 
 * `ridge_regressor` (same as `ridge`) : `Ridge regression <https://scikit-learn.org/stable/modules/generated/sklearn.linear_model.RidgeCV.html>`_.
 
+* `lasso_regressor` (same as `lasso`) : `Lasso regression <https://scikit-learn.org/stable/modules/generated/sklearn.linear_model.LassoCV.html>`_.
+
 * `dummy_regressor` : A `dummy regressor <https://scikit-learn.org/stable/modules/generated/sklearn.dummy.DummyRegressor.html>`_ is a regressor that makes predictions using simple rules. It is useful as a simple baseline to compare with other regressors.
 
 .. note::