Merge pull request #85 from htwangtw/update-nilearn

Update nilearn version to 0.9.0
courtois-neuromod · Jan 28, 2022 · ee0ac86 · ee0ac86
2 parents 85d345a + fa38500
commit ee0ac86
Show file tree

Hide file tree

Showing 3 changed files with 218 additions and 237 deletions.
diff --git a/dypac/dypac.py b/dypac/dypac.py
@@ -15,8 +15,8 @@
 from joblib import Memory
 from nilearn import datasets, image
 from nilearn._utils.niimg_conversions import _resolve_globbing
-from nilearn.input_data import NiftiMasker
-from nilearn.input_data.masker_validation import check_embedded_nifti_masker
+from nilearn.maskers import NiftiMasker
+from nilearn.maskers._masker_validation import _check_embedded_nifti_masker
 from nilearn.decomposition.base import BaseDecomposition
 
 import dypac.bascpp as bpp
@@ -261,7 +261,7 @@ def fit(self, imgs, confounds=None):
             at the object level.
         """
         imgs, confounds = _sanitize_imgs(imgs, confounds)
-        self.masker_ = check_embedded_nifti_masker(self)
+        self.masker_ = _check_embedded_nifti_masker(self)
 
         # Avoid warning with imgs != None
         # if masker_ has been provided a mask_img
@@ -289,7 +289,7 @@ def fit(self, imgs, confounds=None):
                     )
                 )
             self.mask = self._mask_grey_matter(self.masker_.mask_img_)
-            self.masker_ = check_embedded_nifti_masker(self)
+            self.masker_ = _check_embedded_nifti_masker(self)
             self.masker_.fit()
 
         self.mask_img_ = self.masker_.mask_img_

diff --git a/examples/dypac_demo.ipynb b/examples/dypac_demo.ipynb
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 jupyter>=1.0.0
 matplotlib>=3.1.1
-git+git://github.com/nilearn/nilearn.git@8e972c4d382a74fb126f768a0ae02e01e817515c
+nilearn>=0.9.0
 scikit-learn>=0.21.3
 black>=19.3b0
 tqdm>=4.41.1