nimare 0.5.2__tar.gz → 0.5.3rc1__tar.gz

{nimare-0.5.2/nimare.egg-info → nimare-0.5.3rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nimare
-Version: 0.5.2
+Version: 0.5.3rc1
 Summary: NiMARE: Neuroimaging Meta-Analysis Research Environment
 Home-page: https://github.com/neurostuff/NiMARE
 Author: NiMARE developers
@@ -29,7 +29,7 @@ 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.10.1
+Requires-Dist: nilearn!=0.10.3,<0.12.0,>=0.10.1
 Requires-Dist: numba>=0.57.0
 Requires-Dist: numpy>=1.22
 Requires-Dist: pandas>=2.0.0

{nimare-0.5.2 → nimare-0.5.3rc1}/nimare/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-13T15:08:07-0500",
+ "date": "2025-07-26T17:24:25-0500",
  "dirty": false,
  "error": null,
- "full-revisionid": "7e419f548a157365699540e7709955df4ea89293",
- "version": "0.5.2"
+ "full-revisionid": "096951f4879c2b5f508463c2efc4a3da9ebaf9bc",
+ "version": "0.5.3rc1"
 }
 '''  # END VERSION_JSON
 

{nimare-0.5.2 → nimare-0.5.3rc1}/nimare/reports/base.py

@@ -79,6 +79,7 @@ PARAMETERS_DICT = {
     "varcope": "Variance of the parameter estimate",
     "t": "T-statistic",
     "z": "Z-statistic",
+    "vfwe_only": "Voxel-level FWE only",
 }
 
 PNG_SNIPPET = """\
@@ -172,7 +173,7 @@ def _get_ibma_summary(dset, sel_ids):
     ]
 
     maptype_text = ["<li>Available maps: ", "<ul>"]
-    maptype_text.extend(f"<li>{PARAMETERS_DICT[m]} ({m})</li>" for m in map_type)
+    maptype_text.extend(f"<li>{PARAMETERS_DICT.get(m, m)} ({m})</li>" for m in map_type)
     maptype_text.extend(["</ul>", "</li>"])
 
     ibma_text.extend(maptype_text)
@@ -201,7 +202,9 @@ def _get_kernel_summary(params_dict):
     kernel_transformer = str(params_dict["kernel_transformer"])
     ker_params = {k: v for k, v in params_dict.items() if k.startswith("kernel_transformer__")}
     ker_params_text = ["<ul>"]
-    ker_params_text.extend(f"<li>{PARAMETERS_DICT[k]}: {v}</li>" for k, v in ker_params.items())
+    ker_params_text.extend(
+        f"<li>{PARAMETERS_DICT.get(k, k)}: {v}</li>" for k, v in ker_params.items()
+    )
     ker_params_text.append("</ul>")
     ker_params_text = "".join(ker_params_text)
 
@@ -216,7 +219,7 @@ def _gen_est_summary(obj, out_filename):
     ker_text = _get_kernel_summary(params_dict) if isinstance(obj, CBMAEstimator) else ""
 
     est_params = {k: v for k, v in params_dict.items() if not k.startswith("kernel_transformer")}
-    est_params_text = [f"<li>{PARAMETERS_DICT[k]}: {v}</li>" for k, v in est_params.items()]
+    est_params_text = [f"<li>{PARAMETERS_DICT.get(k, k)}: {v}</li>" for k, v in est_params.items()]
     est_params_text = "".join(est_params_text)
 
     est_name = obj.__class__.__name__
@@ -233,12 +236,14 @@ def _gen_cor_summary(obj, out_filename):
     """Generate html with parameter use in obj (e.g., corrector)."""
     params_dict = obj.get_params()
 
-    cor_params_text = [f"<li>{PARAMETERS_DICT[k]}: {v}</li>" for k, v in params_dict.items()]
+    cor_params_text = [
+        f"<li>{PARAMETERS_DICT.get(k, k)}: {v}</li>" for k, v in params_dict.items()
+    ]
     cor_params_text = "".join(cor_params_text)
 
     ext_params_text = ["<ul>"]
     ext_params_text.extend(
-        f"<li>{PARAMETERS_DICT[k]}: {v}</li>" for k, v in obj.parameters.items()
+        f"<li>{PARAMETERS_DICT.get(k, k)}: {v}</li>" for k, v in obj.parameters.items()
     )
     ext_params_text.append("</ul>")
     ext_params_text = "".join(ext_params_text)

{nimare-0.5.2 → nimare-0.5.3rc1}/nimare/utils.py

@@ -207,7 +207,7 @@ def mm2vox(xyz, affine):
     From here:
     http://blog.chrisgorgolewski.org/2014/12/how-to-convert-between-voxel-and-mm.html
     """
-    with np.errstate(invalid='ignore'):
+    with np.errstate(invalid="ignore"):
         ijk = nib.affines.apply_affine(np.linalg.inv(affine), xyz).astype(int)
     return ijk
 

{nimare-0.5.2 → nimare-0.5.3rc1/nimare.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nimare
-Version: 0.5.2
+Version: 0.5.3rc1
 Summary: NiMARE: Neuroimaging Meta-Analysis Research Environment
 Home-page: https://github.com/neurostuff/NiMARE
 Author: NiMARE developers
@@ -29,7 +29,7 @@ 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.10.1
+Requires-Dist: nilearn!=0.10.3,<0.12.0,>=0.10.1
 Requires-Dist: numba>=0.57.0
 Requires-Dist: numpy>=1.22
 Requires-Dist: pandas>=2.0.0

{nimare-0.5.2 → nimare-0.5.3rc1}/nimare.egg-info/requires.txt

@@ -4,7 +4,7 @@ jinja2
 joblib>=1.3.0
 matplotlib>=3.6.0
 nibabel>=3.2.0
-nilearn!=0.10.3,>=0.10.1
+nilearn!=0.10.3,<0.12.0,>=0.10.1
 numba>=0.57.0
 numpy>=1.22
 pandas>=2.0.0

{nimare-0.5.2 → nimare-0.5.3rc1}/setup.cfg

@@ -32,7 +32,7 @@ install_requires =
 	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.10.3 # https://github.com/nilearn/nilearn/pull/4256 0.10.3 is broken
+	nilearn>=0.10.1,<0.12.0,!=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