From 2b1c23aaac81822382a228eb1391868f07f53148 Mon Sep 17 00:00:00 2001 From: James Kent Date: Wed, 10 Jan 2024 18:07:48 -0600 Subject: [PATCH] [FIX] bump min numpy/seaborn versions (#861) * bump min numpy/seaborn versions * rollback numpy dependencies and change how dtype is cast * run black --- nimare/meta/utils.py | 4 +--- setup.cfg | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nimare/meta/utils.py b/nimare/meta/utils.py index 736628da9..d445277ec 100755 --- a/nimare/meta/utils.py +++ b/nimare/meta/utils.py @@ -122,9 +122,7 @@ def compute_kda_ma( n_dim = ijks.shape[1] xx, yy, zz = [slice(-r // vox_dims[i], r // vox_dims[i] + 0.01, 1) for i in range(n_dim)] - cube = np.vstack( - [row.ravel() for row in np.mgrid[xx, yy, zz]], dtype=np.int32, casting="unsafe" - ) + cube = np.vstack([row.ravel() for row in (np.mgrid[xx, yy, zz]).astype(np.int32)]) kernel = cube[:, np.sum(np.dot(np.diag(vox_dims), cube) ** 2, 0) ** 0.5 <= r] if sum_across_studies: diff --git a/setup.cfg b/setup.cfg index 83279717a..1b0c1f95b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -55,7 +55,7 @@ install_requires = requests # nimare.extract scikit-learn>=1.0.0 # nimare.annotate and nimare.decode scipy>=1.6.0 - seaborn # nimare.reports + seaborn>=0.13.0 # nimare.reports sparse>=0.13.0 # for kernel transformers statsmodels!=0.13.2 # this version doesn't install properly tqdm # progress bars throughout package @@ -92,7 +92,7 @@ minimum = matplotlib==3.5.2 nibabel==4.0.0 nilearn==0.10.1 - numpy==1.24.1 + numpy==1.22 pandas==2.0.0 pymare==0.0.4rc2 scikit-learn==1.0.0