diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index a293b88f4..4ab033e3a 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -232,6 +232,8 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v2 - name: Upload to CodeCov - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 with: fail_ci_if_error: true + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/nimare/meta/ibma.py b/nimare/meta/ibma.py index daef906dd..ef5cdfdfd 100755 --- a/nimare/meta/ibma.py +++ b/nimare/meta/ibma.py @@ -9,7 +9,14 @@ import pandas as pd import pymare from joblib import Memory -from nilearn._utils.niimg_conversions import _check_same_fov + +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.image import concat_imgs, resample_to_img from nilearn.input_data import NiftiMasker from nilearn.mass_univariate import permuted_ols @@ -105,7 +112,7 @@ def _preprocess_input(self, dataset): imgs = [ ( nib.load(img) - if _check_same_fov(nib.load(img), reference_masker=mask_img) + if check_same_fov(nib.load(img), reference_masker=mask_img) else resample_to_img(nib.load(img), mask_img, **self._resample_kwargs) ) for img in self.inputs_[name] diff --git a/setup.cfg b/setup.cfg index 9da42ef33..6c6abc4b7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,7 +44,7 @@ install_requires = joblib>=1.3.0 # parallelization matplotlib>=3.5.2 # 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.10.3 # until https://github.com/nilearn/nilearn/pull/4256 is resolved + nilearn>=0.10.1,!=0.10.3 # https://github.com/nilearn/nilearn/pull/4256 0.10.3 is broken numba>=0.57.0 # used by sparse numpy>=1.22 # numba needs NumPy 1.22 or greater pandas>=2.0.0