nimare 0.5.1rc2__py3-none-any.whl → 0.5.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- nimare/_version.py +3 -3
- nimare/reports/base.py +10 -5
- nimare/utils.py +2 -1
- {nimare-0.5.1rc2.dist-info → nimare-0.5.3.dist-info}/METADATA +2 -2
- {nimare-0.5.1rc2.dist-info → nimare-0.5.3.dist-info}/RECORD +9 -9
- {nimare-0.5.1rc2.dist-info → nimare-0.5.3.dist-info}/LICENSE +0 -0
- {nimare-0.5.1rc2.dist-info → nimare-0.5.3.dist-info}/WHEEL +0 -0
- {nimare-0.5.1rc2.dist-info → nimare-0.5.3.dist-info}/entry_points.txt +0 -0
- {nimare-0.5.1rc2.dist-info → nimare-0.5.3.dist-info}/top_level.txt +0 -0
nimare/_version.py
CHANGED
@@ -8,11 +8,11 @@ import json
|
|
8
8
|
|
9
9
|
version_json = '''
|
10
10
|
{
|
11
|
-
"date": "2025-
|
11
|
+
"date": "2025-07-26T17:24:25-0500",
|
12
12
|
"dirty": false,
|
13
13
|
"error": null,
|
14
|
-
"full-revisionid": "
|
15
|
-
"version": "0.5.
|
14
|
+
"full-revisionid": "096951f4879c2b5f508463c2efc4a3da9ebaf9bc",
|
15
|
+
"version": "0.5.3"
|
16
16
|
}
|
17
17
|
''' # END VERSION_JSON
|
18
18
|
|
nimare/reports/base.py
CHANGED
@@ -79,6 +79,7 @@ PARAMETERS_DICT = {
|
|
79
79
|
"varcope": "Variance of the parameter estimate",
|
80
80
|
"t": "T-statistic",
|
81
81
|
"z": "Z-statistic",
|
82
|
+
"vfwe_only": "Voxel-level FWE only",
|
82
83
|
}
|
83
84
|
|
84
85
|
PNG_SNIPPET = """\
|
@@ -172,7 +173,7 @@ def _get_ibma_summary(dset, sel_ids):
|
|
172
173
|
]
|
173
174
|
|
174
175
|
maptype_text = ["<li>Available maps: ", "<ul>"]
|
175
|
-
maptype_text.extend(f"<li>{PARAMETERS_DICT
|
176
|
+
maptype_text.extend(f"<li>{PARAMETERS_DICT.get(m, m)} ({m})</li>" for m in map_type)
|
176
177
|
maptype_text.extend(["</ul>", "</li>"])
|
177
178
|
|
178
179
|
ibma_text.extend(maptype_text)
|
@@ -201,7 +202,9 @@ def _get_kernel_summary(params_dict):
|
|
201
202
|
kernel_transformer = str(params_dict["kernel_transformer"])
|
202
203
|
ker_params = {k: v for k, v in params_dict.items() if k.startswith("kernel_transformer__")}
|
203
204
|
ker_params_text = ["<ul>"]
|
204
|
-
ker_params_text.extend(
|
205
|
+
ker_params_text.extend(
|
206
|
+
f"<li>{PARAMETERS_DICT.get(k, k)}: {v}</li>" for k, v in ker_params.items()
|
207
|
+
)
|
205
208
|
ker_params_text.append("</ul>")
|
206
209
|
ker_params_text = "".join(ker_params_text)
|
207
210
|
|
@@ -216,7 +219,7 @@ def _gen_est_summary(obj, out_filename):
|
|
216
219
|
ker_text = _get_kernel_summary(params_dict) if isinstance(obj, CBMAEstimator) else ""
|
217
220
|
|
218
221
|
est_params = {k: v for k, v in params_dict.items() if not k.startswith("kernel_transformer")}
|
219
|
-
est_params_text = [f"<li>{PARAMETERS_DICT
|
222
|
+
est_params_text = [f"<li>{PARAMETERS_DICT.get(k, k)}: {v}</li>" for k, v in est_params.items()]
|
220
223
|
est_params_text = "".join(est_params_text)
|
221
224
|
|
222
225
|
est_name = obj.__class__.__name__
|
@@ -233,12 +236,14 @@ def _gen_cor_summary(obj, out_filename):
|
|
233
236
|
"""Generate html with parameter use in obj (e.g., corrector)."""
|
234
237
|
params_dict = obj.get_params()
|
235
238
|
|
236
|
-
cor_params_text = [
|
239
|
+
cor_params_text = [
|
240
|
+
f"<li>{PARAMETERS_DICT.get(k, k)}: {v}</li>" for k, v in params_dict.items()
|
241
|
+
]
|
237
242
|
cor_params_text = "".join(cor_params_text)
|
238
243
|
|
239
244
|
ext_params_text = ["<ul>"]
|
240
245
|
ext_params_text.extend(
|
241
|
-
f"<li>{PARAMETERS_DICT
|
246
|
+
f"<li>{PARAMETERS_DICT.get(k, k)}: {v}</li>" for k, v in obj.parameters.items()
|
242
247
|
)
|
243
248
|
ext_params_text.append("</ul>")
|
244
249
|
ext_params_text = "".join(ext_params_text)
|
nimare/utils.py
CHANGED
@@ -207,7 +207,8 @@ def mm2vox(xyz, affine):
|
|
207
207
|
From here:
|
208
208
|
http://blog.chrisgorgolewski.org/2014/12/how-to-convert-between-voxel-and-mm.html
|
209
209
|
"""
|
210
|
-
|
210
|
+
with np.errstate(invalid="ignore"):
|
211
|
+
ijk = nib.affines.apply_affine(np.linalg.inv(affine), xyz).astype(int)
|
211
212
|
return ijk
|
212
213
|
|
213
214
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: nimare
|
3
|
-
Version: 0.5.
|
3
|
+
Version: 0.5.3
|
4
4
|
Summary: NiMARE: Neuroimaging Meta-Analysis Research Environment
|
5
5
|
Home-page: https://github.com/neurostuff/NiMARE
|
6
6
|
Author: NiMARE developers
|
@@ -28,7 +28,7 @@ Requires-Dist: jinja2
|
|
28
28
|
Requires-Dist: joblib>=1.3.0
|
29
29
|
Requires-Dist: matplotlib>=3.6.0
|
30
30
|
Requires-Dist: nibabel>=3.2.0
|
31
|
-
Requires-Dist: nilearn!=0.10.3,>=0.10.1
|
31
|
+
Requires-Dist: nilearn!=0.10.3,<0.12.0,>=0.10.1
|
32
32
|
Requires-Dist: numba>=0.57.0
|
33
33
|
Requires-Dist: numpy>=1.22
|
34
34
|
Requires-Dist: pandas>=2.0.0
|
@@ -1,7 +1,7 @@
|
|
1
1
|
benchmarks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
2
2
|
benchmarks/bench_cbma.py,sha256=fg_EER8hohi6kD1Hno_uXsFntKuCLTvseu-6OqkHkoU,1382
|
3
3
|
nimare/__init__.py,sha256=HHIq3EimSZSf3zJSDwuTjBig1GbRwHGYfRLSqI3yleE,802
|
4
|
-
nimare/_version.py,sha256=
|
4
|
+
nimare/_version.py,sha256=FqbLq6rX96jf92mbcN6-SQe5m-vCbd5kkyZJd7JgpDE,497
|
5
5
|
nimare/base.py,sha256=9DlcRB2mW759p7XqpKG3wRE-MmPsEPiYTbq6V1Yile4,7826
|
6
6
|
nimare/cli.py,sha256=Zvy5jN2KopH_MBke-gm8A0DbBZmIFGvnE1tjhbYib9I,3695
|
7
7
|
nimare/correct.py,sha256=2eI0jR6_odND-2CzSlaxRU2um6ccLSapd7ERAYteBnE,17110
|
@@ -14,7 +14,7 @@ nimare/nimads.py,sha256=2s5QnaLvrBt-kMrImGhG_p6r0unysufIIcPczr2bG0c,24342
|
|
14
14
|
nimare/results.py,sha256=7szcyR6PkZAXBqbIGGWrw1nW9j9QCdpdl4MxUK_1Wzc,8190
|
15
15
|
nimare/stats.py,sha256=XhXfFj6KHTPVSTXhbEid0qt8HLqJD82Bl5T23qmaf40,10098
|
16
16
|
nimare/transforms.py,sha256=_kZO8N3IEHxd6Ir4IcewZtkWHpFknnjEnjsaD9b-1pg,30136
|
17
|
-
nimare/utils.py,sha256=
|
17
|
+
nimare/utils.py,sha256=ku22q1qaCRq-rtorSlOPawbUGgA0LmNU6b7zXyFVaGM,47046
|
18
18
|
nimare/annotate/__init__.py,sha256=hTla1yFYTJ8PDjm72ReeHa3qf0Que50Ww0fqz3Z86JI,434
|
19
19
|
nimare/annotate/cogat.py,sha256=xzrepAuTkRenbECn4XYwgyul45r0tIMxCDKQV_ZFVb8,7457
|
20
20
|
nimare/annotate/gclda.py,sha256=P2OQjuJn3DX0GVPte_VIVZf0LfO-yE_OhLbs6DwMaHQ,42592
|
@@ -41,7 +41,7 @@ nimare/meta/cbma/ale.py,sha256=ZNjXC4MXhfSHvrTRppY04NkGtz_Iri696k5QMuBog7o,39273
|
|
41
41
|
nimare/meta/cbma/base.py,sha256=-gJ4hW6_6T5oto3pre9GbWodHWRmPS2WZ1LJjB0BtMI,38382
|
42
42
|
nimare/meta/cbma/mkda.py,sha256=V5vSQodiLZoZhkYPhous0a_-1pZoRjAIL8gmGyyoezc,60397
|
43
43
|
nimare/reports/__init__.py,sha256=zGfrOPlMq2lTorKNEpyPblArFCnsvz3dRsvOHy_Ciag,428
|
44
|
-
nimare/reports/base.py,sha256=
|
44
|
+
nimare/reports/base.py,sha256=6iGk0zF6zxIdNTNMyiloyPbafbUbUMMnvE4NkAG1KAE,23648
|
45
45
|
nimare/reports/default.yml,sha256=zTcWUlC9ntvacMcIIUAJPoFV8XrvPGqCH2uwovwB4Wc,6003
|
46
46
|
nimare/reports/figures.py,sha256=lxa20_n3PZ1aJMvkbzYqaptJZTUpJotQT-Rjwv-DAz0,21835
|
47
47
|
nimare/reports/report.tpl,sha256=ZweYiJF80zdaIwK1iawAl1pwmBZdPjpxXxY5C0U5yVs,5518
|
@@ -111,9 +111,9 @@ nimare/workflows/cbma.py,sha256=2jYJs9kH7_LzFP6d7-oTHiTTgAFbtmiBNtBXSCSZPjg,7052
|
|
111
111
|
nimare/workflows/ibma.py,sha256=lAkWtqSqnZiUUV460Bh046U9LeGhnry3bl8BFi-tx7s,4289
|
112
112
|
nimare/workflows/macm.py,sha256=mVUBeKbTawhU93ApnkunZSUXZWo7qBPrM3dMGWfl0ik,2531
|
113
113
|
nimare/workflows/misc.py,sha256=OWgHlSAnRI0-5Seii-bd48piIYsfEAF_aNKGorH1yJQ,1827
|
114
|
-
nimare-0.5.
|
115
|
-
nimare-0.5.
|
116
|
-
nimare-0.5.
|
117
|
-
nimare-0.5.
|
118
|
-
nimare-0.5.
|
119
|
-
nimare-0.5.
|
114
|
+
nimare-0.5.3.dist-info/LICENSE,sha256=PWPXnCGWh-FMiBZ61OnQ2BHFjPPlJJ7F0kFx_ryzp-M,1074
|
115
|
+
nimare-0.5.3.dist-info/METADATA,sha256=27p5cjwoChWmR6EcV2hiqYxUnxbNJQKfWGzkSlnA9Rk,4703
|
116
|
+
nimare-0.5.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
|
117
|
+
nimare-0.5.3.dist-info/entry_points.txt,sha256=3w_hk9N2PWnKZkCaJyDlc0_kdn3rh35aiI21rSdvsuA,44
|
118
|
+
nimare-0.5.3.dist-info/top_level.txt,sha256=XnOcEXMs0BxdI8t3_ksTl96T8hykn9L7-bxLLraVrTI,18
|
119
|
+
nimare-0.5.3.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|