junifer 0.0.5.dev36__py3-none-any.whl → 0.0.5.dev42__py3-none-any.whl

junifer/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.5.dev36'
-__version_tuple__ = version_tuple = (0, 0, 5, 'dev36')
+__version__ = version = '0.0.5.dev42'
+__version_tuple__ = version_tuple = (0, 0, 5, 'dev42')

junifer/api/functions.py

@@ -5,6 +5,7 @@
 #          Synchon Mandal <s.mandal@fz-juelich.de>
 # License: AGPL
 
+import os
 import shutil
 import typing
 from pathlib import Path
@@ -339,12 +340,12 @@ def reset(config: Dict) -> None:
     storage = config["storage"]
     storage_uri = Path(storage["uri"])
     logger.info(f"Deleting {storage_uri.resolve()!s}")
-    # Delete storage; will be str
+    # Delete storage
     if storage_uri.exists():
-        # Delete files in the directory
-        for file in storage_uri.iterdir():
+        # Delete files in the job storage directory
+        for file in storage_uri.parent.iterdir():
             file.unlink(missing_ok=True)
-        # Remove directory
+        # Remove job storage directory
         storage_uri.parent.rmdir()
 
     # Fetch job name (if present)
@@ -359,8 +360,9 @@ def reset(config: Dict) -> None:
         if job_dir.exists():
             # Remove files and directories
             shutil.rmtree(job_dir)
-            # Remove directory
-            job_dir.parent.rmdir()
+            # Remove parent directory (if empty)
+            if not next(os.scandir(job_dir.parent), None):
+                job_dir.parent.rmdir()        
 
 
 def list_elements(

junifer/datagrabber/aomic/id1000.py

@@ -24,8 +24,9 @@ class DataladAOMICID1000(PatternDataladDataGrabber):
         The directory where the datalad dataset will be cloned. If None,
         the datalad dataset will be cloned into a temporary directory
         (default None).
-    types: {"BOLD", "BOLD_confounds", "T1w", "VBM_CSF", "VBM_GM", \
-           "VBM_WM", "DWI"} or a list of the options, optional
+    types: {"BOLD", "BOLD_confounds", "BOLD_mask", "T1w", "T1w_mask", \
+           "VBM_CSF", "VBM_GM", "VBM_WM", "DWI"} or \
+           a list of the options, optional
         AOMIC data types. If None, all available data types are selected.
         (default None).
     native_t1w : bool, optional

junifer/datagrabber/aomic/piop1.py

@@ -26,8 +26,9 @@ class DataladAOMICPIOP1(PatternDataladDataGrabber):
         The directory where the datalad dataset will be cloned. If None,
         the datalad dataset will be cloned into a temporary directory
         (default None).
-    types: {"BOLD", "BOLD_confounds", "T1w", "VBM_CSF", "VBM_GM", \
-           "VBM_WM", "DWI"} or a list of the options, optional
+    types: {"BOLD", "BOLD_confounds", "BOLD_mask", "T1w", "T1w_mask", \
+           "VBM_CSF", "VBM_GM", "VBM_WM", "DWI"} or \
+           a list of the options, optional
         AOMIC data types. If None, all available data types are selected.
         (default None).
     tasks : {"restingstate", "anticipation", "emomatching", "faces", \

junifer/datagrabber/aomic/piop2.py

@@ -26,8 +26,9 @@ class DataladAOMICPIOP2(PatternDataladDataGrabber):
         The directory where the datalad dataset will be cloned. If None,
         the datalad dataset will be cloned into a temporary directory
         (default None).
-    types: {"BOLD", "BOLD_confounds", "T1w", "VBM_CSF", "VBM_GM", \
-           "VBM_WM", "DWI"} or a list of the options, optional
+    types: {"BOLD", "BOLD_confounds", "BOLD_mask", "T1w", "T1w_mask", \
+           "VBM_CSF", "VBM_GM", "VBM_WM", "DWI"} or \
+           a list of the options, optional
         AOMIC data types. If None, all available data types are selected.
         (default None).
     tasks : {"restingstate", "stopsignal", "workingmemory"} \

junifer/datagrabber/dmcc13_benchmark.py

@@ -25,8 +25,9 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
         The directory where the datalad dataset will be cloned. If None,
         the datalad dataset will be cloned into a temporary directory
         (default None).
-    types: {"BOLD", "BOLD_confounds", "T1w", "VBM_CSF", "VBM_GM", \
-           "VBM_WM"} or a list of the options, optional
+    types: {"BOLD", "BOLD_confounds", "BOLD_mask", "T1w", "T1w_mask", \
+           "VBM_CSF", "VBM_GM", "VBM_WM", "Warp" (only if \
+           "native_t1w = True")} or a list of the options, optional
         DMCC data types. If None, all available data types are selected.
         (default None).
     sessions: {"ses-wave1bas", "ses-wave1pro", "ses-wave1rea"} or list of \

{junifer-0.0.5.dev36.dist-info → junifer-0.0.5.dev42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.5.dev36
+Version: 0.0.5.dev42
 Summary: JUelich NeuroImaging FEature extractoR
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
 Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>

{junifer-0.0.5.dev36.dist-info → junifer-0.0.5.dev42.dist-info}/RECORD

@@ -1,10 +1,10 @@
 junifer/__init__.py,sha256=x1UR2jUcrUdm2HNl-3Qvyi4UUrU6ms5qm2qcmNY7zZk,391
-junifer/_version.py,sha256=mtiYNkxzw1J_5KKK0VZDDFERULfO3kg5_ZQlOd7_imI,426
+junifer/_version.py,sha256=GC-Zk4bYfeDF8BRadMXm7umiKtz6yuOvNxmCwdxJoMU,426
 junifer/stats.py,sha256=jN22_qFvWYBU9ZIMnCSzN4iOscWnWrcrUPIdLeDkV64,6163
 junifer/api/__init__.py,sha256=pSj8V8tmwOAQ3sshWJfRfB-n3z5bcJj3pHOBX4-8ONc,251
 junifer/api/cli.py,sha256=wtU7Rv9tDIT-4KQAkG6WxiE6mop3cuz6XxGDewceHPs,15329
 junifer/api/decorators.py,sha256=8bnwHPAe7VgzKxl--M_e0umdAlTVSzaJQHEJZ5kof5k,2580
-junifer/api/functions.py,sha256=29bGcpFueL3mjOcoNWU0xaHpM5aIrRQod-U2o-5_TSs,12938
+junifer/api/functions.py,sha256=zCWLXDZ_cAqRZ5bFeky0KeqBztuoa6L3-djI65tqtpY,13055
 junifer/api/parser.py,sha256=a3SSC2xO-PF1pqXZXFq8Sh9aVd-dmHolJbCkGyOUTAM,4416
 junifer/api/utils.py,sha256=dyjTdPMwX9qeCrn8SQT2Pjshfnu-y1FEyujV7lCzvm0,3333
 junifer/api/queue_context/__init__.py,sha256=_yXJ8woTxLNLoSR3yLxAW7MtC5sa-oCRxewsZ9D3j98,271
@@ -87,15 +87,15 @@ junifer/data/tests/test_template_spaces.py,sha256=PJulN7xHpAcSOTY-UzTG_WPywZEBSl
 junifer/datagrabber/__init__.py,sha256=fhHKsZyBeqCFJJMr53VF6EUkNrFuUZkNR8QZbaoHTNg,680
 junifer/datagrabber/base.py,sha256=KgMSKfkwd4yLW4PhoJDoWMgcDkGmDoIs6jkgKyOJd9A,6303
 junifer/datagrabber/datalad_base.py,sha256=SsGUJdefdDgAJARBG5kHcbLK2CvvnoEto0TpGZUgnWE,10659
-junifer/datagrabber/dmcc13_benchmark.py,sha256=K7-TnVRCDQwL6IIaFofJABKr2Jho0loewAavzdmBjK0,12869
+junifer/datagrabber/dmcc13_benchmark.py,sha256=rLf6TD9fvjUwuiaqF0vXSDs9w6r3jhNHorKXX7gG8LQ,12945
 junifer/datagrabber/multiple.py,sha256=eXQIsvSNvD8GuEITjMaMoi1GwoeyWXXbQMRi-f2qgc4,4923
 junifer/datagrabber/pattern.py,sha256=5XQe0k3iiTID5fbUsShjFKaqkueuPU34ZpzOi1JzFEw,12700
 junifer/datagrabber/pattern_datalad.py,sha256=y9ptDZEhSj41pf05WNySrj8j4kbi5uIXveFXv4dkKpk,4092
 junifer/datagrabber/utils.py,sha256=NseewPJvhc0h7Ueyfi_KRUwFfs2V7HspBtYL2Xr9Dik,6965
 junifer/datagrabber/aomic/__init__.py,sha256=R7yrRVBWsBW25CH0fw-KHpFwb_EC-MlPKDzssGfj5A0,281
-junifer/datagrabber/aomic/id1000.py,sha256=hvi-25NWeakUX4Pu1YDjxfKbo6U4WUjw-I9c2kGmgnk,6005
-junifer/datagrabber/aomic/piop1.py,sha256=ivQ1wjYAR1qb-fN13NWA-69iS8XvgMMUCwQR5fBh2n0,8428
-junifer/datagrabber/aomic/piop2.py,sha256=LuYQL4t4k-K_74Gd8zVnV7Y5W6tt1krBpk0a7D5LQ9Q,8047
+junifer/datagrabber/aomic/id1000.py,sha256=5mGBBQUuhWn-HMNrCy9rQd8_ANjrW-AkwRmdllOwSvM,6043
+junifer/datagrabber/aomic/piop1.py,sha256=GIxuv0n36967jW8v_tdKmvyb24JDF9bXsoI33mU5Y6w,8466
+junifer/datagrabber/aomic/piop2.py,sha256=LOUj-29xddsT3ktOc5_pjuHrqCwR-1gnx1QmkHfWiOg,8085
 junifer/datagrabber/aomic/tests/test_id1000.py,sha256=cA329VAbZ9mY89vi756xqq1p4LHkBp4e7d_OZJOLsGk,4700
 junifer/datagrabber/aomic/tests/test_piop1.py,sha256=Faqmya-OisThPom1nooxlacaCD4afLFSw03Wn58gK6g,5466
 junifer/datagrabber/aomic/tests/test_piop2.py,sha256=8emWWImX-ltUHJtEFWo8Jng_0kK-Yz66RyA7ddt-By4,5265
@@ -256,10 +256,10 @@ junifer/utils/logging.py,sha256=furcU3XIUpUvnpe4PEwzWWIWgmH4j2ZA4MQdvSGWjj0,9216
 junifer/utils/tests/test_fs.py,sha256=WQS7cKlKEZ742CIuiOYYpueeAhY9PqlastfDVpVVtvE,923
 junifer/utils/tests/test_helpers.py,sha256=k5qqfxK8dFyuewTJyR1Qn6-nFaYNuVr0ysc18bfPjyU,929
 junifer/utils/tests/test_logging.py,sha256=l8oo-AiBV7H6_IzlsNcj__cLeZBUvgIGoaMszD9VaJg,7754
-junifer-0.0.5.dev36.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.5.dev36.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.5.dev36.dist-info/METADATA,sha256=5OmMaGrG1dIzsg8i7OHCyLkntZ0QeeKLmhtzCFZIRBo,8234
-junifer-0.0.5.dev36.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-junifer-0.0.5.dev36.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
-junifer-0.0.5.dev36.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.5.dev36.dist-info/RECORD,,
+junifer-0.0.5.dev42.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.5.dev42.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.5.dev42.dist-info/METADATA,sha256=jfY04v7LExnFrN28b_6_AxpFz0_YdCK1x_iTqsnKa9M,8234
+junifer-0.0.5.dev42.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+junifer-0.0.5.dev42.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
+junifer-0.0.5.dev42.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.5.dev42.dist-info/RECORD,,