[MAINT] bump to nilearn >= 0.12.1

nimare/annotate/gclda.py

@@ -6,7 +6,7 @@
 import nibabel as nib
 import numpy as np
 import pandas as pd
-from nilearn._utils import load_niimg
+from nilearn._utils.niimg import load_niimg
 from scipy.stats import multivariate_normal
 
 from nimare.base import NiMAREBase

nimare/base.py

@@ -7,7 +7,7 @@
 from abc import ABCMeta
 from collections import defaultdict
 
-from nilearn._utils import CacheMixin
+from nilearn._utils.cache_mixin import CacheMixin
 
 LGR = logging.getLogger(__name__)
 

nimare/dataset.py

@@ -9,7 +9,7 @@
 
 import numpy as np
 import pandas as pd
-from nilearn._utils import load_niimg
+from nilearn._utils.niimg import load_niimg
 
 from nimare.base import NiMAREBase
 from nimare.utils import (

nimare/decode/continuous.py

@@ -9,7 +9,7 @@
 import numpy as np
 import pandas as pd
 from joblib import Parallel, delayed
-from nilearn._utils import load_niimg
+from nilearn._utils.niimg import load_niimg
 from nilearn.masking import apply_mask
 from tqdm.auto import tqdm
 

nimare/decode/discrete.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 import pandas as pd
-from nilearn._utils import load_niimg
+from nilearn._utils.niimg import load_niimg
 from pymare.stats import bonferroni, fdr
 from scipy import special
 from scipy.stats import binom

nimare/meta/ibma.py

@@ -11,13 +11,7 @@
 import pymare
 from joblib import Memory
 
-try:
-    # nilearn>0.10.3
-    from nilearn._utils.niimg_conversions import check_same_fov
-except ImportError:
-    # nilearn < 0.10.3
-    from nilearn._utils.niimg_conversions import _check_same_fov as check_same_fov
-
+from nilearn._utils.niimg_conversions import check_same_fov
 from nilearn.image import concat_imgs, resample_to_img
 from nilearn.input_data import NiftiMasker
 from nilearn.mass_univariate import permuted_ols

nimare/nimads.py

@@ -5,7 +5,7 @@
 from copy import deepcopy
 
 import numpy as np
-from nilearn._utils import load_niimg
+from nilearn._utils.niimg import load_niimg
 
 from nimare.io import convert_nimads_to_dataset
 from nimare.utils import mm2vox

nimare/workflows/misc.py

@@ -3,7 +3,7 @@
 import logging
 
 import nibabel as nib
-from nilearn._utils import check_niimg_3d
+from nilearn._utils.niimg_conversions import check_niimg_3d
 from nilearn.image import math_img
 
 LGR = logging.getLogger(__name__)

setup.cfg

@@ -30,19 +30,19 @@ install_requires =
     jinja2 # nimare.reports
     joblib>=1.3.0  # parallelization
     matplotlib>=3.6.0  # this is for nilearn, which doesn't include it in its reqs
-    nibabel>=3.2.0  # I/O of niftis
-    nilearn>=0.10.1,<0.12.0,!=0.10.3 # https://github.com/nilearn/nilearn/pull/4256 0.10.3 is broken
+    nibabel>=5.2.0  # I/O of niftis
+    nilearn>=0.12.1
     numba>=0.57.0 # used by sparse
-    numpy>=1.22 # numba needs NumPy 1.22 or greater
-    pandas>=2.0.0
+    numpy>=1.22.4 # numba needs NumPy 1.22 or greater
+    pandas>=2.2.0
     patsy  # for cbmr
     plotly  # nimare.reports
     pymare>=0.0.8  # nimare.meta.ibma and stats
     pyyaml # nimare.reports
     requests  # nimare.extract
     ridgeplot  # nimare.reports
     scikit-learn>=1.0.0  # nimare.annotate and nimare.decode
-    scipy>=1.6.0
+    scipy>=1.8.0
     sparse>=0.13.0  # for kernel transformers
     statsmodels!=0.13.2  # this version doesn't install properly
     tqdm  # progress bars throughout package