nimare 0.5.5__tar.gz → 0.6.1__tar.gz

{nimare-0.5.5/nimare.egg-info → nimare-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nimare
-Version: 0.5.5
+Version: 0.6.1
 Summary: NiMARE: Neuroimaging Meta-Analysis Research Environment
 Home-page: https://github.com/neurostuff/NiMARE
 Author: NiMARE developers
@@ -13,26 +13,25 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cognitiveatlas>=0.1.11
 Requires-Dist: fuzzywuzzy
-Requires-Dist: importlib-resources; python_version < "3.9"
 Requires-Dist: jinja2
 Requires-Dist: joblib>=1.3.0
 Requires-Dist: matplotlib>=3.6.0
-Requires-Dist: nibabel>=3.2.0
-Requires-Dist: nilearn!=0.10.3,<0.12.0,>=0.10.1
+Requires-Dist: nibabel>=5.2.0
+Requires-Dist: nilearn>=0.10.1
 Requires-Dist: numba>=0.57.0
-Requires-Dist: numpy>=1.22
-Requires-Dist: pandas>=2.0.0
+Requires-Dist: numpy>=1.22.4
+Requires-Dist: pandas>=2.1.4
 Requires-Dist: patsy
 Requires-Dist: plotly
 Requires-Dist: pymare>=0.0.8
@@ -40,7 +39,7 @@ Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: ridgeplot
 Requires-Dist: scikit-learn>=1.0.0
-Requires-Dist: scipy>=1.6.0
+Requires-Dist: scipy>=1.8.0
 Requires-Dist: sparse>=0.13.0
 Requires-Dist: statsmodels!=0.13.2
 Requires-Dist: tqdm
@@ -64,7 +63,7 @@ Requires-Dist: sphinxcontrib-bibtex; extra == "doc"
 Requires-Dist: sphinxcontrib-mermaid; extra == "doc"
 Requires-Dist: docutils<0.21,>=0.18.1; extra == "doc"
 Provides-Extra: tests
-Requires-Dist: coverage; extra == "tests"
+Requires-Dist: coverage>=7.7; extra == "tests"
 Requires-Dist: coveralls; extra == "tests"
 Requires-Dist: flake8-black; extra == "tests"
 Requires-Dist: flake8-docstrings; extra == "tests"
@@ -72,15 +71,15 @@ Requires-Dist: flake8-isort; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Provides-Extra: minimum
-Requires-Dist: matplotlib==3.6.0; extra == "minimum"
-Requires-Dist: nibabel==4.0.0; extra == "minimum"
-Requires-Dist: nilearn==0.10.1; extra == "minimum"
-Requires-Dist: numpy==1.22; extra == "minimum"
-Requires-Dist: pandas==2.0.0; extra == "minimum"
-Requires-Dist: pymare==0.0.8; extra == "minimum"
-Requires-Dist: scikit-learn==1.0.0; extra == "minimum"
-Requires-Dist: scipy==1.6.0; extra == "minimum"
-Requires-Dist: seaborn==0.13.0; extra == "minimum"
+Requires-Dist: matplotlib==3.6.0; python_version < "3.11" and extra == "minimum"
+Requires-Dist: nibabel==5.2.0; python_version < "3.11" and extra == "minimum"
+Requires-Dist: nilearn==0.10.1; python_version < "3.11" and extra == "minimum"
+Requires-Dist: numpy==1.22.4; python_version < "3.11" and extra == "minimum"
+Requires-Dist: pandas==2.1.4; python_version < "3.11" and extra == "minimum"
+Requires-Dist: pymare==0.0.8; python_version < "3.11" and extra == "minimum"
+Requires-Dist: scikit-learn==1.0.0; python_version < "3.11" and extra == "minimum"
+Requires-Dist: scipy==1.8.0; python_version < "3.11" and extra == "minimum"
+Requires-Dist: seaborn==0.13.0; python_version < "3.11" and extra == "minimum"
 Provides-Extra: all
 Requires-Dist: indexed_gzip>=1.4.0; extra == "all"
 Requires-Dist: torch>=2.0; extra == "all"
@@ -98,7 +97,7 @@ Requires-Dist: sphinx_rtd_theme>=1.3.0; extra == "all"
 Requires-Dist: sphinxcontrib-bibtex; extra == "all"
 Requires-Dist: sphinxcontrib-mermaid; extra == "all"
 Requires-Dist: docutils<0.21,>=0.18.1; extra == "all"
-Requires-Dist: coverage; extra == "all"
+Requires-Dist: coverage>=7.7; extra == "all"
 Requires-Dist: coveralls; extra == "all"
 Requires-Dist: flake8-black; extra == "all"
 Requires-Dist: flake8-docstrings; extra == "all"

{nimare-0.5.5 → nimare-0.6.1}/nimare/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-08-05T15:30:46-0500",
+ "date": "2025-10-08T13:03:06-0500",
  "dirty": false,
  "error": null,
- "full-revisionid": "3d14cdf106b289e46d8823db8e68e82185aae8be",
- "version": "0.5.5"
+ "full-revisionid": "9a3fd0a77e169993e8db60379caad136471fd866",
+ "version": "0.6.1"
 }
 '''  # END VERSION_JSON
 

{nimare-0.5.5 → nimare-0.6.1}/nimare/annotate/gclda.py

@@ -6,7 +6,7 @@ import os.path as op
 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
@@ -183,7 +183,7 @@ class GCLDAModel(NiMAREBase):
         if n_terms_in_corpus != n_terms:
             LGR.warning(
                 "Some terms in count_df do not appear in corpus. "
-                f"Retaining {n_terms_in_corpus/n_terms} terms."
+                f"Retaining {n_terms_in_corpus / n_terms} terms."
             )
 
         # Get updated vocabulary

{nimare-0.5.5 → nimare-0.6.1}/nimare/base.py

@@ -7,7 +7,7 @@ import pickle
 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-0.5.5 → nimare-0.6.1}/nimare/dataset.py

@@ -9,7 +9,7 @@ import warnings
 
 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-0.5.5 → nimare-0.6.1}/nimare/decode/continuous.py

@@ -9,7 +9,7 @@ import nibabel as nib
 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-0.5.5 → nimare-0.6.1}/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-0.6.1/nimare/exceptions.py

@@ -0,0 +1,9 @@
+"""Custom exceptions for NiMARE."""
+
+
+class NiMAREError(Exception):
+    """Base class for NiMARE exceptions."""
+
+
+class InvalidStudysetError(NiMAREError):
+    """Exception raised when a studyset is invalid or malformed."""