junifer 0.0.5.dev164__py3-none-any.whl → 0.0.5.dev180__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.
- junifer/_version.py +2 -2
- junifer/api/tests/test_api_utils.py +2 -2
- junifer/markers/brainprint.py +6 -3
- junifer/markers/falff/_afni_falff.py +2 -2
- junifer/markers/reho/_afni_reho.py +1 -1
- junifer/pipeline/pipeline_step_mixin.py +7 -3
- junifer/preprocess/smoothing/_afni_smoothing.py +1 -1
- junifer/utils/logging.py +5 -3
- {junifer-0.0.5.dev164.dist-info → junifer-0.0.5.dev180.dist-info}/METADATA +2 -2
- {junifer-0.0.5.dev164.dist-info → junifer-0.0.5.dev180.dist-info}/RECORD +15 -15
- {junifer-0.0.5.dev164.dist-info → junifer-0.0.5.dev180.dist-info}/WHEEL +1 -1
- {junifer-0.0.5.dev164.dist-info → junifer-0.0.5.dev180.dist-info}/AUTHORS.rst +0 -0
- {junifer-0.0.5.dev164.dist-info → junifer-0.0.5.dev180.dist-info}/LICENSE.md +0 -0
- {junifer-0.0.5.dev164.dist-info → junifer-0.0.5.dev180.dist-info}/entry_points.txt +0 -0
- {junifer-0.0.5.dev164.dist-info → junifer-0.0.5.dev180.dist-info}/top_level.txt +0 -0
junifer/_version.py
CHANGED
@@ -12,5 +12,5 @@ __version__: str
|
|
12
12
|
__version_tuple__: VERSION_TUPLE
|
13
13
|
version_tuple: VERSION_TUPLE
|
14
14
|
|
15
|
-
__version__ = version = '0.0.5.
|
16
|
-
__version_tuple__ = version_tuple = (0, 0, 5, '
|
15
|
+
__version__ = version = '0.0.5.dev180'
|
16
|
+
__version_tuple__ = version_tuple = (0, 0, 5, 'dev180')
|
@@ -4,6 +4,7 @@
|
|
4
4
|
# License: AGPL
|
5
5
|
|
6
6
|
import platform as pl
|
7
|
+
import sys
|
7
8
|
|
8
9
|
import pytest
|
9
10
|
|
@@ -49,8 +50,7 @@ def test_get_dependency_information_short() -> None:
|
|
49
50
|
"looseversion",
|
50
51
|
]
|
51
52
|
|
52
|
-
|
53
|
-
if python_minor_version < 10:
|
53
|
+
if sys.version_info < (3, 11):
|
54
54
|
dependency_list.append("importlib_metadata")
|
55
55
|
|
56
56
|
assert frozenset(dependency_information.keys()) == frozenset(
|
junifer/markers/brainprint.py
CHANGED
@@ -3,10 +3,13 @@
|
|
3
3
|
# Authors: Synchon Mandal <s.mandal@fz-juelich.de>
|
4
4
|
# License: AGPL
|
5
5
|
|
6
|
-
|
7
|
-
|
8
|
-
|
6
|
+
import sys
|
7
|
+
|
8
|
+
|
9
|
+
if sys.version_info < (3, 11): # pragma: no cover
|
9
10
|
from importlib_metadata import packages_distributions
|
11
|
+
else:
|
12
|
+
from importlib.metadata import packages_distributions
|
10
13
|
|
11
14
|
import uuid
|
12
15
|
from copy import deepcopy
|
@@ -124,7 +124,7 @@ class AFNIALFF:
|
|
124
124
|
convert_alff_cmd = [
|
125
125
|
"3dAFNItoNIFTI",
|
126
126
|
f"-prefix {alff_afni_to_nifti_out_path.resolve()}",
|
127
|
-
f"{alff_falff_out_path_prefix}_ALFF+
|
127
|
+
f"{alff_falff_out_path_prefix}_ALFF+orig.BRIK",
|
128
128
|
]
|
129
129
|
# Call 3dAFNItoNIFTI
|
130
130
|
run_ext_cmd(name="3dAFNItoNIFTI", cmd=convert_alff_cmd)
|
@@ -136,7 +136,7 @@ class AFNIALFF:
|
|
136
136
|
convert_falff_cmd = [
|
137
137
|
"3dAFNItoNIFTI",
|
138
138
|
f"-prefix {falff_afni_to_nifti_out_path.resolve()}",
|
139
|
-
f"{alff_falff_out_path_prefix}_fALFF+
|
139
|
+
f"{alff_falff_out_path_prefix}_fALFF+orig.BRIK",
|
140
140
|
]
|
141
141
|
# Call 3dAFNItoNIFTI
|
142
142
|
run_ext_cmd(name="3dAFNItoNIFTI", cmd=convert_falff_cmd)
|
@@ -181,7 +181,7 @@ class AFNIReHo:
|
|
181
181
|
convert_cmd = [
|
182
182
|
"3dAFNItoNIFTI",
|
183
183
|
f"-prefix {reho_afni_to_nifti_out_path.resolve()}",
|
184
|
-
f"{reho_out_path_prefix}+
|
184
|
+
f"{reho_out_path_prefix}+orig.BRIK",
|
185
185
|
]
|
186
186
|
# Call 3dAFNItoNIFTI
|
187
187
|
run_ext_cmd(name="3dAFNItoNIFTI", cmd=convert_cmd)
|
@@ -4,10 +4,14 @@
|
|
4
4
|
# Synchon Mandal <s.mandal@fz-juelich.de>
|
5
5
|
# License: AGPL
|
6
6
|
|
7
|
-
|
8
|
-
|
9
|
-
|
7
|
+
import sys
|
8
|
+
|
9
|
+
|
10
|
+
if sys.version_info < (3, 11): # pragma: no cover
|
10
11
|
from importlib_metadata import packages_distributions
|
12
|
+
else:
|
13
|
+
from importlib.metadata import packages_distributions
|
14
|
+
|
11
15
|
|
12
16
|
from importlib.util import find_spec
|
13
17
|
from itertools import chain
|
@@ -105,7 +105,7 @@ class AFNISmoothing:
|
|
105
105
|
convert_cmd = [
|
106
106
|
"3dAFNItoNIFTI",
|
107
107
|
f"-prefix {blur_afni_to_nifti_out_path.resolve()}",
|
108
|
-
f"{blur_out_path_prefix}+
|
108
|
+
f"{blur_out_path_prefix}+orig.BRIK",
|
109
109
|
]
|
110
110
|
# Call 3dAFNItoNIFTI
|
111
111
|
run_ext_cmd(name="3dAFNItoNIFTI", cmd=convert_cmd)
|
junifer/utils/logging.py
CHANGED
@@ -4,13 +4,15 @@
|
|
4
4
|
# Synchon Mandal <s.mandal@fz-juelich.de>
|
5
5
|
# License: AGPL
|
6
6
|
|
7
|
-
|
7
|
+
import sys
|
8
|
+
|
9
|
+
|
10
|
+
if sys.version_info < (3, 12):
|
8
11
|
from distutils.version import LooseVersion
|
9
|
-
|
12
|
+
else: # pragma: no cover
|
10
13
|
from looseversion import LooseVersion
|
11
14
|
|
12
15
|
import logging
|
13
|
-
import sys
|
14
16
|
from pathlib import Path
|
15
17
|
from subprocess import PIPE, Popen, TimeoutExpired
|
16
18
|
from typing import Dict, NoReturn, Optional, Type, Union
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: junifer
|
3
|
-
Version: 0.0.5.
|
3
|
+
Version: 0.0.5.dev180
|
4
4
|
Summary: JUelich NeuroImaging FEature extractoR
|
5
5
|
Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
|
6
6
|
Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
|
@@ -42,7 +42,7 @@ Requires-Dist: httpx[http2] ==0.26.0
|
|
42
42
|
Requires-Dist: tqdm ==4.66.1
|
43
43
|
Requires-Dist: templateflow >=23.0.0
|
44
44
|
Requires-Dist: lapy <2.0.0,>=1.0.0
|
45
|
-
Requires-Dist: importlib-metadata ; python_version < "3.
|
45
|
+
Requires-Dist: importlib-metadata ; python_version < "3.9"
|
46
46
|
Requires-Dist: looseversion ==1.3.0 ; python_version >= "3.12"
|
47
47
|
Provides-Extra: all
|
48
48
|
Requires-Dist: bctpy ==0.6.0 ; extra == 'all'
|
@@ -1,5 +1,5 @@
|
|
1
1
|
junifer/__init__.py,sha256=-T9XmiCCL0j3YLx-0Pph15sPfL5FlcBDscajjJ-V4sU,604
|
2
|
-
junifer/_version.py,sha256=
|
2
|
+
junifer/_version.py,sha256=qo4yop6ut9LFgev0EsENpBz5BZ_dUgwq-jzypAN6ccM,428
|
3
3
|
junifer/stats.py,sha256=BjQb2lfTGDP9l4UuQYmJFcJJNRfbJDGlNvC06SJaDDE,6237
|
4
4
|
junifer/api/__init__.py,sha256=lwyIF0hPc7fICuSoddJfay0LPqlTRxHJ_xbtizgFYZA,312
|
5
5
|
junifer/api/cli.py,sha256=53pews3mXkJ7DUDSkV51PbitYnuVAdQRkWG-gjO08Uw,16142
|
@@ -36,7 +36,7 @@ junifer/api/res/fsl/flirt,sha256=tSjiUco8ui8AbHD7mTzChEwbR0Rf_4iJTgzYTPF_WuQ,42
|
|
36
36
|
junifer/api/res/fsl/img2imgcoord,sha256=Zmaw3oJYrEltcXiPyEubXry9ppAq3SND52tdDWGgeZk,49
|
37
37
|
junifer/api/res/fsl/run_fsl_docker.sh,sha256=pq-fcNdLuvHzVIQePN4GebZGlcE2UF-xj5rBIqAMz4g,1122
|
38
38
|
junifer/api/res/fsl/std2imgcoord,sha256=-X5wRH6XMl0yqnTACJX6MFhO8DFOEWg42MHRxGvimXg,49
|
39
|
-
junifer/api/tests/test_api_utils.py,sha256=
|
39
|
+
junifer/api/tests/test_api_utils.py,sha256=aM4cCMf3orGURlXTcjBk0TVV0TF9yuFr4biH7eDG0F8,2696
|
40
40
|
junifer/api/tests/test_cli.py,sha256=kyDu-51lBmIBlQ2MnmmecC3nENrQuZRpk0bCkAPqmWM,10969
|
41
41
|
junifer/api/tests/test_functions.py,sha256=unLxIMwB3f7HF3ESq0JCfRaQhNB9Xj0JEi1OMkWsgtQ,17753
|
42
42
|
junifer/api/tests/test_parser.py,sha256=eUz2JPVb0_cxvoeI1O_C5PMNs5v_lDzGsN6fV1VW5Eg,6109
|
@@ -137,7 +137,7 @@ junifer/external/nilearn/junifer_nifti_spheres_masker.py,sha256=DbSK2hKrgpHZ_vCR
|
|
137
137
|
junifer/external/nilearn/tests/test_junifer_nifti_spheres_masker.py,sha256=zpvBYIvaNjUj9fIUg5K78LRzJqbyMYlUo2UQYS9_lo4,12275
|
138
138
|
junifer/markers/__init__.py,sha256=u4BFgS_3GXAwFN2HfqdAhlBkyenLw4IYlMlwXwnjkVQ,1235
|
139
139
|
junifer/markers/base.py,sha256=7_TLrz8dZH_3t1zgSSW2yCnDO2DGGAxFMZLHDkvJ_NM,6985
|
140
|
-
junifer/markers/brainprint.py,sha256=
|
140
|
+
junifer/markers/brainprint.py,sha256=ztAjTaarQKm5TacirEQNcL4G00dm71uZF5S6S4vDvsI,21818
|
141
141
|
junifer/markers/collection.py,sha256=13nccLKJp2nMs07hLpvcSYlvfj_L1fntmFrYeAE2jLM,5544
|
142
142
|
junifer/markers/ets_rss.py,sha256=gyy8BPPSEhM1fWh0aQqzjxLihTslnXhKqyJcdhZQsdA,4586
|
143
143
|
junifer/markers/parcel_aggregation.py,sha256=QaPqweCocO_dsC4rHyl-lWwDaXrqCzrsK5g32zjbsZU,8748
|
@@ -161,7 +161,7 @@ junifer/markers/complexity/tests/test_range_entropy_auc.py,sha256=G6kpmAfYUKid9B
|
|
161
161
|
junifer/markers/complexity/tests/test_sample_entropy.py,sha256=tgx4dN88CwxkrkCHFFRN9204fdK19l2mHmIjQZ0mq6E,2262
|
162
162
|
junifer/markers/complexity/tests/test_weighted_perm_entropy.py,sha256=z7BFk5LIZCEbMNPqR9IWqhhOfJ7yIsK71Thylg08Xx0,2325
|
163
163
|
junifer/markers/falff/__init__.py,sha256=qGr8HFhTnwTMWGTf96nRLYZgIXYmf4DLLIcsMiS62p0,240
|
164
|
-
junifer/markers/falff/_afni_falff.py,sha256=
|
164
|
+
junifer/markers/falff/_afni_falff.py,sha256=QNi_4MU4_sfnfXedrYHT-kn17KCDE6a7ELfSGmRZPmA,4521
|
165
165
|
junifer/markers/falff/_junifer_falff.py,sha256=Datf23VxbiD6ZiC-3tANN9MMVHuZKzQx04nX1GXA25c,4417
|
166
166
|
junifer/markers/falff/falff_base.py,sha256=XXnL-voEjWgLLq9ueX_SJcIwKGAZPxIpdEhpuq8cNuo,5723
|
167
167
|
junifer/markers/falff/falff_parcels.py,sha256=G3ZVD7_SdJvrLy7Nyl-qypm0SFxa55PFJWIvQORCJoc,5040
|
@@ -182,7 +182,7 @@ junifer/markers/functional_connectivity/tests/test_functional_connectivity_base.
|
|
182
182
|
junifer/markers/functional_connectivity/tests/test_functional_connectivity_parcels.py,sha256=iV1HY2t0ywBjOn06SLBlfn3x2c3Yuopq8W4pPQyfdzQ,3096
|
183
183
|
junifer/markers/functional_connectivity/tests/test_functional_connectivity_spheres.py,sha256=wMK5GVcRz68zsCPMtTXxoG7H68Ab8wk9_bsrcyRz1R4,5090
|
184
184
|
junifer/markers/reho/__init__.py,sha256=_6WkTQcg0ksZguSQGi1XuoMKuGwYs5tvDLVZ1h6xB5E,232
|
185
|
-
junifer/markers/reho/_afni_reho.py,sha256=
|
185
|
+
junifer/markers/reho/_afni_reho.py,sha256=iaZFPJbyB9-QQAZ5-kKxwN0APB5MH85pOAChq-JFLNI,6469
|
186
186
|
junifer/markers/reho/_junifer_reho.py,sha256=7-jD28YQQWb3dfT6SxyYfGugFSq8wi7_2hUA-ryiGAo,9307
|
187
187
|
junifer/markers/reho/reho_base.py,sha256=HQ75f5qQ8RL10BpzNiHWmo7AwM7L58gs5sAPZLP8hfc,4516
|
188
188
|
junifer/markers/reho/reho_parcels.py,sha256=tqAl7_X0mQZ-ipQtC9qiV5vz_dh76z3mdfjBSQx4vYg,6170
|
@@ -207,7 +207,7 @@ junifer/onthefly/__init__.py,sha256=WykjD_q_zWyX40Y5iKsFXhPJLzD1NPcN-XKFKZDMXfc,
|
|
207
207
|
junifer/onthefly/read_transform.py,sha256=kZ-N_fKe9glaBTjhj_HXrdTtWXGI-fMoBpsawcOgsTw,4340
|
208
208
|
junifer/onthefly/tests/test_read_transform.py,sha256=D2C3IpXQHdsJSF07v8rEwGntLGXjZOserlRhebJUAVM,4719
|
209
209
|
junifer/pipeline/__init__.py,sha256=mmhtYuRGetBmBvKPVb9MxklcEK_R9ly-dgkzQiOp3g8,363
|
210
|
-
junifer/pipeline/pipeline_step_mixin.py,sha256=
|
210
|
+
junifer/pipeline/pipeline_step_mixin.py,sha256=VABcgFgXoBvo_rCzCmWyGZgtfDTPA50NzYiVqbE2MZI,7279
|
211
211
|
junifer/pipeline/registry.py,sha256=UDByAvfWjTImUVrI7d9Ol2C7_s287-mSjtj8lMvhIck,4325
|
212
212
|
junifer/pipeline/singleton.py,sha256=c5U8Xn10MQqaXjlLzxLbw3AmSYW6aTw_iSL0rDkbuMU,1011
|
213
213
|
junifer/pipeline/update_meta_mixin.py,sha256=A_gYCPqdPlM0Xpum9TjJowb41O7ntxQg6y4YOgYeyy4,1564
|
@@ -223,7 +223,7 @@ junifer/preprocess/confounds/__init__.py,sha256=LvgaRJz1-JtkaPoLZHUYlwJX5Hs1tm4E
|
|
223
223
|
junifer/preprocess/confounds/fmriprep_confound_remover.py,sha256=g5thIiva1XAP_zkKMV0_CydLtkRUGokBxmQ1GdXCroc,20151
|
224
224
|
junifer/preprocess/confounds/tests/test_fmriprep_confound_remover.py,sha256=xN9tPkktuRHQtmY1UOP0H_sXT7LXPY282kMgYkoQTFE,19973
|
225
225
|
junifer/preprocess/smoothing/__init__.py,sha256=M-402qVDu_AZH0HadPb6kPOla9kpI0Mz5rBwx-pOh5Y,177
|
226
|
-
junifer/preprocess/smoothing/_afni_smoothing.py,sha256=
|
226
|
+
junifer/preprocess/smoothing/_afni_smoothing.py,sha256=Ta5FJ_IP14AjIv76f_Qck0D53gRh20amwXF-h7nWK9A,3266
|
227
227
|
junifer/preprocess/smoothing/_fsl_smoothing.py,sha256=ZBdP4VsaQEYD9JYUitAXSccwvP3GZ0FyqhriV8gJxyk,3035
|
228
228
|
junifer/preprocess/smoothing/_nilearn_smoothing.py,sha256=bshMj2DKEFkNiUbpaBoBfFFI6O80FIN49Oa3nc6FgaA,1928
|
229
229
|
junifer/preprocess/smoothing/smoothing.py,sha256=Bb9_0wvt1CfwzpxN_svPiQ2euOZkAT9S--4qr8omhyQ,5355
|
@@ -259,14 +259,14 @@ junifer/tests/test_stats.py,sha256=3vPMgYYpWxk8ECDFOMm3-dFBlh4XxjL83SwRBSBAHok,4
|
|
259
259
|
junifer/utils/__init__.py,sha256=V1-1FKPhACiS2nUr8TTgQFq7irEnp2an5YdIU3Zz7RY,439
|
260
260
|
junifer/utils/fs.py,sha256=M3CKBLh4gPS6s9giyopgb1hHMXzLb6k3cung2wHVBjs,492
|
261
261
|
junifer/utils/helpers.py,sha256=uEdZ3wCgvbWwp1v0DdxIbaV8qORmNSoJIaWmb9haKh0,1366
|
262
|
-
junifer/utils/logging.py,sha256=
|
262
|
+
junifer/utils/logging.py,sha256=T9gzk7l1O-dmRiZJHggVDkQGzup_P2_FV3xsaoq0BmI,9369
|
263
263
|
junifer/utils/tests/test_fs.py,sha256=WQS7cKlKEZ742CIuiOYYpueeAhY9PqlastfDVpVVtvE,923
|
264
264
|
junifer/utils/tests/test_helpers.py,sha256=k5qqfxK8dFyuewTJyR1Qn6-nFaYNuVr0ysc18bfPjyU,929
|
265
265
|
junifer/utils/tests/test_logging.py,sha256=l8oo-AiBV7H6_IzlsNcj__cLeZBUvgIGoaMszD9VaJg,7754
|
266
|
-
junifer-0.0.5.
|
267
|
-
junifer-0.0.5.
|
268
|
-
junifer-0.0.5.
|
269
|
-
junifer-0.0.5.
|
270
|
-
junifer-0.0.5.
|
271
|
-
junifer-0.0.5.
|
272
|
-
junifer-0.0.5.
|
266
|
+
junifer-0.0.5.dev180.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
|
267
|
+
junifer-0.0.5.dev180.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
|
268
|
+
junifer-0.0.5.dev180.dist-info/METADATA,sha256=Sl8jNa8ncy1reirlZDX0UyuaRj535lOwr9vLJhS-2U8,8280
|
269
|
+
junifer-0.0.5.dev180.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
|
270
|
+
junifer-0.0.5.dev180.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
|
271
|
+
junifer-0.0.5.dev180.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
|
272
|
+
junifer-0.0.5.dev180.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|