lsst-ctrl-bps-htcondor 29.2025.3700__py3-none-any.whl → 29.2025.3800__py3-none-any.whl

lsst/ctrl/bps/htcondor/htcondor_service.py

@@ -705,16 +705,16 @@ def _create_job(subdir_template, cached_values, generic_workflow, gwjob, out_pre
 
     htc_job_cmds.update(_translate_job_cmds(cached_values, generic_workflow, gwjob))
 
-    # job stdout, stderr, htcondor user log.
+    # Combine stdout and stderr to reduce the number of files.
     for key in ("output", "error"):
         if cached_values["overwriteJobFiles"]:
-            htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).{key[:3]}"
+            htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).out"
         else:
-            htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).$$([NumJobStarts ?: 0]).{key[:3]}"
+            htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).$$([NumJobStarts ?: 0]).out"
         _LOG.debug("HTCondor %s = %s", key, htc_job_cmds[key])
 
     key = "log"
-    htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).{key[:3]}"
+    htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).{key}"
     _LOG.debug("HTCondor %s = %s", key, htc_job_cmds[key])
 
     htc_job_cmds.update(

lsst/ctrl/bps/htcondor/lssthtc.py

@@ -530,7 +530,7 @@ def htc_write_condor_file(
                     print(f"{key}={value}", file=fh)
         for key in ["output", "error", "log"]:
             if key not in job:
-                filename = f"{job_name}.$(Cluster).${key[:3]}"
+                filename = f"{job_name}.$(Cluster).{'out' if key != 'log' else key}"
                 print(f"{key}={filename}", file=fh)
 
         if job_attrs is not None:

lsst/ctrl/bps/htcondor/provisioner.py

@@ -194,8 +194,9 @@ class Provisioner:
             "getenv": "True",
         }
         cmds |= {
-            stream: str(job.subfile.with_suffix(f".$(Cluster).{stream[:3]}"))
-            for stream in ("output", "error", "log")
+            "output": str(job.subfile.with_suffix(".$(Cluster).out")),
+            "error": str(job.subfile.with_suffix(".$(Cluster).out")),
+            "log": str(job.subfile.with_suffix(".$(Cluster).log")),
         }
         job.add_job_cmds(cmds)
 

lsst/ctrl/bps/htcondor/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.3700"
+__version__ = "29.2025.3800"

{lsst_ctrl_bps_htcondor-29.2025.3700.dist-info → lsst_ctrl_bps_htcondor-29.2025.3800.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps-htcondor
-Version: 29.2025.3700
+Version: 29.2025.3800
 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.3800.dist-info/RECORD

@@ -0,0 +1,19 @@
+lsst/ctrl/bps/htcondor/__init__.py,sha256=1gTmOVLJILvBqgqHVECo8uqoX8e4fiTeH_dHBUXgDvY,1417
+lsst/ctrl/bps/htcondor/final_post.sh,sha256=chfaQV6Q7rGsK-8Hx58ch52m-PofvBanrl7VwCssHec,248
+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=TJOcbxq8CsbrRLvesLL5Up53uuUDckQXew0gB27_QT0,96469
+lsst/ctrl/bps/htcondor/lssthtc.py,sha256=WUkzgWrDHuis90vWU1YMHLWXnbGHcvFK7ZDCr9NKTBs,80537
+lsst/ctrl/bps/htcondor/provisioner.py,sha256=DxhCOCpqyBXIBR2m8VL_FwaDMr2scQIOe8ArWjgQ_Ls,7929
+lsst/ctrl/bps/htcondor/version.py,sha256=1tuAAU5Re7MRhtcbYlCODj58a79T6z8ie3-QgPCtLgE,55
+lsst/ctrl/bps/htcondor/etc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lsst/ctrl/bps/htcondor/etc/htcondor_defaults.yaml,sha256=C6DKJKmKFKczukpXVXev9u1-vmv2IcgcdtjTtgJWDQM,1561
+lsst_ctrl_bps_htcondor-29.2025.3800.dist-info/licenses/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
+lsst_ctrl_bps_htcondor-29.2025.3800.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_ctrl_bps_htcondor-29.2025.3800.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_ctrl_bps_htcondor-29.2025.3800.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_ctrl_bps_htcondor-29.2025.3800.dist-info/METADATA,sha256=zPk0MOG4ecG5OPpxe5fyHWo5coKUQDqKsjJUBrRhlx4,2139
+lsst_ctrl_bps_htcondor-29.2025.3800.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_ctrl_bps_htcondor-29.2025.3800.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_ctrl_bps_htcondor-29.2025.3800.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_ctrl_bps_htcondor-29.2025.3800.dist-info/RECORD,,

lsst_ctrl_bps_htcondor-29.2025.3700.dist-info/RECORD

@@ -1,19 +0,0 @@
-lsst/ctrl/bps/htcondor/__init__.py,sha256=1gTmOVLJILvBqgqHVECo8uqoX8e4fiTeH_dHBUXgDvY,1417
-lsst/ctrl/bps/htcondor/final_post.sh,sha256=chfaQV6Q7rGsK-8Hx58ch52m-PofvBanrl7VwCssHec,248
-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=WKN6bC5cJu8X9UpN5DNMDxb8V0gBOWCthvFyEWUkU7s,96467
-lsst/ctrl/bps/htcondor/lssthtc.py,sha256=MOxY30jCwbW1efgVcWtN4x13OO8monW95t6IidDf86Y,80515
-lsst/ctrl/bps/htcondor/provisioner.py,sha256=hPN8YJUtwNHQylw68kfskF1S2vCeQvztF8W0d_QKqqM,7851
-lsst/ctrl/bps/htcondor/version.py,sha256=AQOxvPBwPILItheZOADktYgvye1bfruQzhiAhgZby0A,55
-lsst/ctrl/bps/htcondor/etc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lsst/ctrl/bps/htcondor/etc/htcondor_defaults.yaml,sha256=C6DKJKmKFKczukpXVXev9u1-vmv2IcgcdtjTtgJWDQM,1561
-lsst_ctrl_bps_htcondor-29.2025.3700.dist-info/licenses/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
-lsst_ctrl_bps_htcondor-29.2025.3700.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_ctrl_bps_htcondor-29.2025.3700.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_ctrl_bps_htcondor-29.2025.3700.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_ctrl_bps_htcondor-29.2025.3700.dist-info/METADATA,sha256=9GSauHRgN1yzHi6a5mqe_Gh1ckTDfkeyn_VCo9SOA9w,2139
-lsst_ctrl_bps_htcondor-29.2025.3700.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_ctrl_bps_htcondor-29.2025.3700.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_ctrl_bps_htcondor-29.2025.3700.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_ctrl_bps_htcondor-29.2025.3700.dist-info/RECORD,,