Skip to content

Commit

Permalink
[FIX] bump min numpy/seaborn versions (#861)
Browse files Browse the repository at this point in the history
* bump min numpy/seaborn versions

* rollback numpy dependencies and change how dtype is cast

* run black
  • Loading branch information
jdkent committed Jan 11, 2024
1 parent ca11ec7 commit 2b1c23a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions nimare/meta/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2b1c23a

Please sign in to comment.