lsst-ctrl-bps-htcondor 29.2025.1600__py3-none-any.whl → 29.2025.1800__py3-none-any.whl

lsst/ctrl/bps/htcondor/lssthtc.py

@@ -703,7 +703,7 @@ def htc_submit_dag(sub):
     return schedd_dag_info
 
 
-def htc_create_submit_from_dag(dag_filename, submit_options=None):
+def htc_create_submit_from_dag(dag_filename: str, submit_options: dict[str, Any]) -> htcondor.Submit:
     """Create a DAGMan job submit description.
 
     Parameters
@@ -730,11 +730,26 @@ def htc_create_submit_from_dag(dag_filename, submit_options=None):
     var_name = "_CONDOR_DAGMAN_MANAGER_JOB_APPEND_GETENV"
     if var_name not in os.environ:
         os.environ[var_name] = "True"
-    do_recurse = submit_options.get("do_recurse", None)
-    if do_recurse:
+
+    if "do_recurse" in submit_options:
         var_name = "_CONDOR_DAGMAN_GENERATE_SUBDAG_SUBMITS"
         if var_name not in os.environ:
-            os.environ[var_name] = str(do_recurse)
+            os.environ[var_name] = str(submit_options["do_recurse"])
+
+    # Config and environment variables do not seem to override -MaxIdle
+    # on the .dag.condor.sub's command line (broken in some 24.0.x versions).
+    # Explicitly forward them as a submit_option if either exists.
+    # Note: auto generated subdag submit files are still the -MaxIdle=1000
+    # in the broken versions.
+    if "MaxIdle" not in submit_options:
+        max_jobs_idle: int | None = None
+        config_var_name = "DAGMAN_MAX_JOBS_IDLE"
+        if f"_CONDOR_{config_var_name}" in os.environ:
+            max_jobs_idle = int(os.environ[f"_CONDOR_{config_var_name}"])
+        elif config_var_name in htcondor.param:
+            max_jobs_idle = htcondor.param[config_var_name]
+        if max_jobs_idle:
+            submit_options["MaxIdle"] = max_jobs_idle
 
     return htcondor.Submit.from_dag(dag_filename, submit_options)
 

lsst/ctrl/bps/htcondor/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.1600"
+__version__ = "29.2025.1800"

{lsst_ctrl_bps_htcondor-29.2025.1600.dist-info → lsst_ctrl_bps_htcondor-29.2025.1800.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps-htcondor
-Version: 29.2025.1600
+Version: 29.2025.1800
 Summary: HTCondor plugin for lsst-ctrl-bps.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_ctrl_bps_htcondor-29.2025.1600.dist-info → lsst_ctrl_bps_htcondor-29.2025.1800.dist-info}/RECORD

@@ -3,17 +3,17 @@ lsst/ctrl/bps/htcondor/final_post.sh,sha256=chfaQV6Q7rGsK-8Hx58ch52m-PofvBanrl7V
 lsst/ctrl/bps/htcondor/handlers.py,sha256=2gM3Ac00in4ob9ckcP331W1LSEjs9UDKIqt4MULA4bg,11196
 lsst/ctrl/bps/htcondor/htcondor_config.py,sha256=c4lCiYEwEXFdxgbMfEkbDm4LrvkRMF31SqLtQqzqIV4,1523
 lsst/ctrl/bps/htcondor/htcondor_service.py,sha256=-qf7FG1yvxawf9vHfUMZtofVrrK06CMbviarLRXGg_0,88308
-lsst/ctrl/bps/htcondor/lssthtc.py,sha256=-cpDETrp0T8oNgaQ9y5M773yuaLM9OwQQg8oht7-uVM,79632
+lsst/ctrl/bps/htcondor/lssthtc.py,sha256=Rsfr7ZehZHiRWmF-8FMDReZQrGMtKii7CO2O8Vu9hYg,80420
 lsst/ctrl/bps/htcondor/provisioner.py,sha256=hPN8YJUtwNHQylw68kfskF1S2vCeQvztF8W0d_QKqqM,7851
-lsst/ctrl/bps/htcondor/version.py,sha256=DWDCyavYRMZByGPGMYcnpz6piNv1sQvCKH8yohX_F3c,55
+lsst/ctrl/bps/htcondor/version.py,sha256=uRdffTNnwH4GQy77H1Wk3Md64craDCIuRxmCtF7ON0g,55
 lsst/ctrl/bps/htcondor/etc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lsst/ctrl/bps/htcondor/etc/htcondor_defaults.yaml,sha256=xDRts4vHKov2PE_JRh-0nF3jfuNJXtKBXZqveASp_iA,1422
-lsst_ctrl_bps_htcondor-29.2025.1600.dist-info/licenses/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
-lsst_ctrl_bps_htcondor-29.2025.1600.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_ctrl_bps_htcondor-29.2025.1600.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_ctrl_bps_htcondor-29.2025.1600.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_ctrl_bps_htcondor-29.2025.1600.dist-info/METADATA,sha256=MVfzl6Z7S_lkRoXpmMpmECgw6AOfhEP4F4DMuKFR1ys,2139
-lsst_ctrl_bps_htcondor-29.2025.1600.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-lsst_ctrl_bps_htcondor-29.2025.1600.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_ctrl_bps_htcondor-29.2025.1600.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_ctrl_bps_htcondor-29.2025.1600.dist-info/RECORD,,
+lsst_ctrl_bps_htcondor-29.2025.1800.dist-info/licenses/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
+lsst_ctrl_bps_htcondor-29.2025.1800.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_ctrl_bps_htcondor-29.2025.1800.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_ctrl_bps_htcondor-29.2025.1800.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_ctrl_bps_htcondor-29.2025.1800.dist-info/METADATA,sha256=bMwrKlHzLXxi4nDsPMVNyaV607WgFOpA9O2-pa-LFDc,2139
+lsst_ctrl_bps_htcondor-29.2025.1800.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+lsst_ctrl_bps_htcondor-29.2025.1800.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_ctrl_bps_htcondor-29.2025.1800.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_ctrl_bps_htcondor-29.2025.1800.dist-info/RECORD,,

{lsst_ctrl_bps_htcondor-29.2025.1600.dist-info → lsst_ctrl_bps_htcondor-29.2025.1800.dist-info}/WHEEL

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