legend-dataflow-scripts 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

{legend_dataflow_scripts-0.1.0.dist-info → legend_dataflow_scripts-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.1.0
+Version: 0.1.2
 Summary: Python package for the processing scripts for LEGEND-200 data
 Author-email: George Marshall <ggmarsh@uw.edu>, Luigi Pertoldi <gipert@pm.me>
 Maintainer: The LEGEND Collaboration
@@ -19,10 +19,10 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: colorlog
 Requires-Dist: dbetto>=1.2.3
-Requires-Dist: pygama>=2.1.1a3
-Requires-Dist: dspeed>=1.6.6a1
+Requires-Dist: pygama>=2.1
+Requires-Dist: dspeed>=1.6
 Requires-Dist: pylegendmeta>=1.2.5
-Requires-Dist: legend-pydataobj>=1.12.0a4
+Requires-Dist: legend-pydataobj>=1.11
 Requires-Dist: legend-daq2lh5>=1.5.0
 Requires-Dist: pip
 Provides-Extra: test

{legend_dataflow_scripts-0.1.0.dist-info → legend_dataflow_scripts-0.1.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 legenddataflowscripts/__init__.py,sha256=hlpvTxSBjOyXlZUyOyYx3VwT5LS6zNzhAZnTmfT3NjU,303
-legenddataflowscripts/_version.py,sha256=-LyU5F1uZDjn6Q8_Z6-_FJt_8RE4Kq9zcKdg1abSSps,511
+legenddataflowscripts/_version.py,sha256=bSmADqydH8nBu-J4lG8UVuR7hnU_zcwhnSav2oQ0W0A,511
 legenddataflowscripts/par/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 legenddataflowscripts/par/geds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 legenddataflowscripts/par/geds/dsp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,12 +25,12 @@ legenddataflowscripts/utils/convert_np.py,sha256=8q_K3w3jAREG-9CJlErP3Vca0OYTYAY
 legenddataflowscripts/utils/log.py,sha256=5v8J7PZJHHoSy12w9e9DkYmqdPvYXj6YfVaMbhvX614,2230
 legenddataflowscripts/utils/pulser_removal.py,sha256=kuARdp1jf-lsUWcb0_KRDp-ZXzkHNrDCXUc3h7TJm7Q,424
 legenddataflowscripts/workflow/__init__.py,sha256=p-57OklNpVYqwMaLctLO8zMvhpXaTILkd3j4CaS_Juk,394
-legenddataflowscripts/workflow/execenv.py,sha256=34V7euhKiTXDDBDuX4t2Oi_zPx6lAcCRYiHqVCz6Xps,9032
+legenddataflowscripts/workflow/execenv.py,sha256=O6Z6EH6Yp0JXnwX2wTzduHC9Q9gu-_d1RuuE2pQ5caE,9061
 legenddataflowscripts/workflow/filedb.py,sha256=rbvOcXUxLbHz177QuDIDAL3aysz-bZDjHOiMsRHssZo,3434
 legenddataflowscripts/workflow/pre_compile_catalog.py,sha256=cEK0KXh-ClSE2Bo9MK471o79XG22bMY5r-2tIihtCfk,790
 legenddataflowscripts/workflow/utils.py,sha256=eKE8KIG2ffynZt9fTbI1SVQV85i3aW9GFGh1Nio1iDo,3118
-legend_dataflow_scripts-0.1.0.dist-info/METADATA,sha256=fzaP59xzQtj2rxNOiq0K29b36LYQgtbo-I44z24-7ew,3134
-legend_dataflow_scripts-0.1.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-legend_dataflow_scripts-0.1.0.dist-info/entry_points.txt,sha256=B197waSm-orA_ZS-9rkxNDsmOHdCn8CbWodnlqXQKRg,1313
-legend_dataflow_scripts-0.1.0.dist-info/top_level.txt,sha256=s8E2chjJNYUbrN6whFG_VCsJKySFp1IOXLcUefA7DB0,22
-legend_dataflow_scripts-0.1.0.dist-info/RECORD,,
+legend_dataflow_scripts-0.1.2.dist-info/METADATA,sha256=FsY5VWfz1t6KmRXwG2iRBnawVy5_yqy3_rNpT50FOHo,3122
+legend_dataflow_scripts-0.1.2.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+legend_dataflow_scripts-0.1.2.dist-info/entry_points.txt,sha256=B197waSm-orA_ZS-9rkxNDsmOHdCn8CbWodnlqXQKRg,1313
+legend_dataflow_scripts-0.1.2.dist-info/top_level.txt,sha256=s8E2chjJNYUbrN6whFG_VCsJKySFp1IOXLcUefA7DB0,22
+legend_dataflow_scripts-0.1.2.dist-info/RECORD,,

{legend_dataflow_scripts-0.1.0.dist-info → legend_dataflow_scripts-0.1.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

legenddataflowscripts/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.0'
-__version_tuple__ = version_tuple = (0, 1, 0)
+__version__ = version = '0.1.2'
+__version_tuple__ = version_tuple = (0, 1, 2)

legenddataflowscripts/workflow/execenv.py

@@ -18,6 +18,8 @@ from . import utils
 
 log = logging.getLogger(__name__)
 
+OCI_ENGINES = ["docker", "podman", "podman-hpc", "shifter"]
+
 
 def _execenv2str(cmd_expr: Iterable, cmd_env: Mapping) -> str:
     return " ".join([f"{k}={v}" for k, v in cmd_env.items()]) + " " + " ".join(cmd_expr)
@@ -27,12 +29,7 @@ def apptainer_env_vars(cmdenv: Mapping) -> list[str]:
     return [f"--env={var}={val}" for var, val in cmdenv.items()]
 
 
-def docker_env_vars(cmdenv: Mapping) -> list[str]:
-    # same syntax
-    return apptainer_env_vars(cmdenv)
-
-
-def shifter_env_vars(cmdenv: Mapping) -> list[str]:
+def oci_engine_env_vars(cmdenv: Mapping) -> list[str]:
     # same syntax
     return apptainer_env_vars(cmdenv)
 
@@ -69,20 +66,20 @@ def execenv_prefix(
                 if has_xdg:
                     cmdline += [f"--bind={xdg_runtime_dir}"]
 
-            elif "docker" in config.execenv.cmd:
-                cmdline += docker_env_vars(config.execenv.env)
-
-            elif "shifter" in config.execenv.cmd:
-                cmdline += shifter_env_vars(config.execenv.env)
+            elif any(engine in config.execenv.cmd for engine in OCI_ENGINES):
+                cmdline += oci_engine_env_vars(config.execenv.env)
 
+            # no XDG mount with shifter
             if (
-                any(exe in config.execenv.cmd for exe in ("docker", "shifter"))
+                any(exe in config.execenv.cmd for exe in OCI_ENGINES)
                 and has_xdg
+                and "shifter" not in config.execenv.cmd
             ):
                 cmdline += [f"--volume={xdg_runtime_dir}:{xdg_runtime_dir}"]
 
         # now we can add the arguments
-        cmdline += shlex.split(config.execenv.arg)
+        _arg = config.execenv.arg
+        cmdline += shlex.split(_arg if isinstance(_arg, str) else " ".join(_arg))
 
     if as_string:
         return _execenv2str(cmdline, cmdenv) + " "
@@ -192,7 +189,7 @@ def dataflow() -> None:
             )
         )
 
-        logger = logging.getLogger("legenddataflow")
+        logger = logging.getLogger("legenddataflowscripts")
         logger.setLevel(logging.DEBUG)
         logger.addHandler(handler)
 
@@ -224,7 +221,8 @@ def install(args) -> None:
     utils.subst_vars(
         config_dict, var_values={"_": config_loc}, use_env=True, ignore_missing=False
     )
-    config_dict["execenv"] = config_dict["execenv"][args.system]
+
+    config_dict["execenv"] = config_dict.execenv[args.system]
 
     # path to virtualenv location
     path_install = config_dict.paths.install