junifer 0.0.4.dev821__py3-none-any.whl → 0.0.4.dev824__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.4.dev821'
-__version_tuple__ = version_tuple = (0, 0, 4, 'dev821')
+__version__ = version = '0.0.4.dev824'
+__version_tuple__ = version_tuple = (0, 0, 4, 'dev824')

junifer/api/cli.py

@@ -114,14 +114,13 @@ def _parse_elements_file(filepath: Path) -> List[Tuple[str, ...]]:
         filepath,
         header=None,  # no header  # type: ignore
         index_col=False,  # no index column
+        dtype=str,
         skipinitialspace=True,  # no leading space after delimiter
     )
     # Remove trailing whitespace in cell entries
-    csv_df_trimmed = csv_df.apply(
-        lambda x: x.str.strip() if x.dtype == "object" else x
-    )
+    csv_df_trimmed = csv_df.apply(lambda x: x.str.strip())
     # Convert to list of tuple of str
-    return list(map(tuple, csv_df_trimmed.to_numpy().astype(str)))
+    return list(map(tuple, csv_df_trimmed.to_numpy()))
 
 
 def _validate_verbose(

junifer/api/tests/test_cli.py

@@ -156,6 +156,21 @@ def test_run_using_element_file(tmp_path: Path, elements: str) -> None:
             " sub-01 , ses-01 \n sub-02, ses-01 ",
             [("sub-01", "ses-01"), ("sub-02", "ses-01")],
         ),
+        ("001,01", [("001", "01")]),
+        (
+            "001,01\n002,02",
+            [("001", "01"), ("002", "02")],
+        ),
+        ("001, 01", [("001", "01")]),
+        (
+            "001, 01\n002, 02",
+            [("001", "01"), ("002", "02")],
+        ),
+        (" 001 , 01 ", [("001", "01")]),
+        (
+            " 001 , 01 \n 002, 02 ",
+            [("001", "01"), ("002", "02")],
+        ),
     ],
 )
 def test_multi_element_access(

{junifer-0.0.4.dev821.dist-info → junifer-0.0.4.dev824.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.4.dev821
+Version: 0.0.4.dev824
 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.4.dev821.dist-info → junifer-0.0.4.dev824.dist-info}/RECORD

@@ -1,8 +1,8 @@
 junifer/__init__.py,sha256=x1UR2jUcrUdm2HNl-3Qvyi4UUrU6ms5qm2qcmNY7zZk,391
-junifer/_version.py,sha256=7R70gnPY70g1d5z-hP_oxweFmYhsTV8C7iLa_yffnkI,428
+junifer/_version.py,sha256=UagWSi-zHoGa6KS0dHcXrPxUENdONGC6fscTIQ6HMn8,428
 junifer/stats.py,sha256=sU5IZ2qFZWbzgSutQS_z42miIVItpSGmQYBn6KkD5fA,6162
 junifer/api/__init__.py,sha256=YILu9M7SC0Ri4CVd90fELH2OnK_gvCYAXCoqBNCFE8E,257
-junifer/api/cli.py,sha256=auw38tIH7ipTnaADM7on0or7zauY-BFII8nd-eRUEJs,13664
+junifer/api/cli.py,sha256=_fC35jp0YzqNIpO5yvTb_5QBmUpw6sRFgVjBeoRbhO8,13627
 junifer/api/decorators.py,sha256=8bnwHPAe7VgzKxl--M_e0umdAlTVSzaJQHEJZ5kof5k,2580
 junifer/api/functions.py,sha256=N59KM2GqxIwMU2tXc44oYCqogclgqD45qI_ULrfGYDQ,11616
 junifer/api/parser.py,sha256=a3SSC2xO-PF1pqXZXFq8Sh9aVd-dmHolJbCkGyOUTAM,4416
@@ -30,7 +30,7 @@ junifer/api/res/fsl/img2imgcoord,sha256=Zmaw3oJYrEltcXiPyEubXry9ppAq3SND52tdDWGg
 junifer/api/res/fsl/run_fsl_docker.sh,sha256=mRLtZo0OgDwleoee2MG6rYI37HVuGNk9zOADwcl97RA,1122
 junifer/api/res/fsl/std2imgcoord,sha256=-X5wRH6XMl0yqnTACJX6MFhO8DFOEWg42MHRxGvimXg,49
 junifer/api/tests/test_api_utils.py,sha256=zDRQiqFOaoO02FpzJCxEbZvsP4u4__Yr25e5k5MJwuI,2713
-junifer/api/tests/test_cli.py,sha256=X24TrEvSXnD8ysVMlaSHPsJPOOUPAzLxLgb3jCj1ahg,8461
+junifer/api/tests/test_cli.py,sha256=FYGuTLlqjB9IifMIdvHEGSQSSy6ym6623fKKPs8PsM8,8871
 junifer/api/tests/test_functions.py,sha256=mvxdaGHxPje-aQGS2fo95xjU7jOf8TYaTWqwFZ5T0oY,17215
 junifer/api/tests/test_parser.py,sha256=eUz2JPVb0_cxvoeI1O_C5PMNs5v_lDzGsN6fV1VW5Eg,6109
 junifer/api/tests/data/gmd_mean.yaml,sha256=Ohb_C5cfQMK-59U9O1ZhejXyBtzLc5Y4cv8QyYq2azg,330
@@ -248,10 +248,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.4.dev821.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.4.dev821.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.4.dev821.dist-info/METADATA,sha256=AFPNBFGNbtVc-0SIzHhTdNHAJQAQtq38g9KvCua_CmQ,8235
-junifer-0.0.4.dev821.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-junifer-0.0.4.dev821.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
-junifer-0.0.4.dev821.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.4.dev821.dist-info/RECORD,,
+junifer-0.0.4.dev824.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.4.dev824.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.4.dev824.dist-info/METADATA,sha256=fGHhDFaE8INr9IaHX8WoX-C_RP2Y52kl8Lx5lizlYPM,8235
+junifer-0.0.4.dev824.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+junifer-0.0.4.dev824.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
+junifer-0.0.4.dev824.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.4.dev824.dist-info/RECORD,,