lsst-ctrl-bps-htcondor 28.2025.600__py3-none-any.whl → 28.2025.800__py3-none-any.whl

lsst/ctrl/bps/htcondor/htcondor_service.py

@@ -39,6 +39,8 @@ from pathlib import Path
 from typing import Any
 
 import htcondor
+from packaging import version
+
 from lsst.ctrl.bps import (
     BaseWmsService,
     BaseWmsWorkflow,
@@ -52,7 +54,6 @@ from lsst.ctrl.bps import (
 from lsst.ctrl.bps.bps_utils import chdir, create_count_summary
 from lsst.daf.butler import Config
 from lsst.utils.timer import time_this
-from packaging import version
 
 from .htcondor_config import HTC_DEFAULTS_URI
 from .lssthtc import (
@@ -372,7 +373,7 @@ class HTCondorService(BaseWmsService):
 
         # Prune child jobs where DAG job is in queue (i.e., aren't orphans).
         job_ids = []
-        for schedd_name, job_info in results.items():
+        for job_info in results.values():
             for job_id, job_ad in job_info.items():
                 _LOG.debug("job_id=%s DAGManJobId=%s", job_id, job_ad.get("DAGManJobId", "None"))
                 if "DAGManJobId" not in job_ad:
@@ -759,7 +760,7 @@ def _translate_job_cmds(cached_vals, generic_workflow, gwjob):
             jobcmds["retry_until"] = f"{gwjob.retry_unless_exit}"
         elif isinstance(gwjob.retry_unless_exit, list):
             jobcmds["retry_until"] = (
-                f'member(ExitCode, {{{",".join([str(x) for x in gwjob.retry_unless_exit])}}})'
+                f"member(ExitCode, {{{','.join([str(x) for x in gwjob.retry_unless_exit])}}})"
             )
         else:
             raise ValueError("retryUnlessExit must be an integer or a list of integers.")
@@ -2133,11 +2134,11 @@ def _gather_site_values(config, compute_site):
 
     key = f".site.{compute_site}.profile.condor"
     if key in config:
-        for key, val in config[key].items():
-            if key.startswith("+"):
-                site_values["attrs"][key[1:]] = val
+        for subkey, val in config[key].items():
+            if subkey.startswith("+"):
+                site_values["attrs"][subkey[1:]] = val
             else:
-                site_values["profile"][key] = val
+                site_values["profile"][subkey] = val
 
     return site_values
 

lsst/ctrl/bps/htcondor/lssthtc.py

@@ -34,38 +34,38 @@ level.  LSST workflows are more complicated.
 """
 
 __all__ = [
+    "MISSING_ID",
     "DagStatus",
+    "HTCDag",
+    "HTCJob",
     "JobStatus",
     "NodeStatus",
     "RestrictedDict",
-    "HTCJob",
-    "HTCDag",
+    "condor_history",
+    "condor_q",
+    "condor_search",
+    "condor_status",
     "htc_backup_files",
     "htc_check_dagman_output",
     "htc_create_submit_from_cmd",
     "htc_create_submit_from_dag",
     "htc_create_submit_from_file",
     "htc_escape",
-    "htc_write_attribs",
-    "htc_write_condor_file",
     "htc_query_history",
     "htc_query_present",
-    "htc_version",
     "htc_submit_dag",
-    "condor_history",
-    "condor_q",
-    "condor_search",
-    "condor_status",
-    "update_job_info",
-    "MISSING_ID",
-    "summary_from_dag",
+    "htc_version",
+    "htc_write_attribs",
+    "htc_write_condor_file",
+    "pegasus_name_to_label",
     "read_dag_info",
     "read_dag_log",
     "read_dag_nodes_log",
     "read_dag_status",
     "read_node_status",
+    "summary_from_dag",
+    "update_job_info",
     "write_dag_info",
-    "pegasus_name_to_label",
 ]
 
 
@@ -688,7 +688,7 @@ def htc_create_submit_from_file(submit_file):
         for line in fh:
             line = line.strip()
             if not line.startswith("#") and not line == "queue":
-                (key, val) = re.split(r"\s*=\s*", line, 1)
+                (key, val) = re.split(r"\s*=\s*", line, maxsplit=1)
                 descriptors[key] = val
 
     # Avoid UserWarning: the line 'copy_to_spool = False' was
@@ -1028,7 +1028,7 @@ class HTCDag(networkx.DiGraph):
         for edge in self.edges():
             print(f"PARENT {edge[0]} CHILD {edge[1]}", file=fh)
         if self.graph["final_job"]:
-            print(f'FINAL {self.graph["final_job"].name}:', file=fh)
+            print(f"FINAL {self.graph['final_job'].name}:", file=fh)
             self.graph["final_job"].dump(fh)
 
     def write_dot(self, filename):

lsst/ctrl/bps/htcondor/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "28.2025.600"
+__version__ = "28.2025.800"

{lsst_ctrl_bps_htcondor-28.2025.600.dist-info → lsst_ctrl_bps_htcondor-28.2025.800.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: lsst-ctrl-bps-htcondor
-Version: 28.2025.600
+Version: 28.2025.800
 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-28.2025.600.dist-info → lsst_ctrl_bps_htcondor-28.2025.800.dist-info}/RECORD

@@ -2,18 +2,18 @@ lsst/ctrl/bps/htcondor/__init__.py,sha256=1gTmOVLJILvBqgqHVECo8uqoX8e4fiTeH_dHBU
 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=GATQ3-P8GZJFSkohUYRABnnTm4dREdbfRI2VOAUuvYo,80334
-lsst/ctrl/bps/htcondor/lssthtc.py,sha256=HCgOBuch0M_XUtUHlTTZ1hWeGpEveeYL2_wU-Aq5pCg,56969
+lsst/ctrl/bps/htcondor/htcondor_service.py,sha256=UGRxT4cT5giQbEmQQfU546oEm2dxDXQRr46YajhRqh4,80335
+lsst/ctrl/bps/htcondor/lssthtc.py,sha256=kouYnXE9tiWGNupkNki0kU26r8p_PhFTOT4w9nNCsXs,56978
 lsst/ctrl/bps/htcondor/provisioner.py,sha256=hPN8YJUtwNHQylw68kfskF1S2vCeQvztF8W0d_QKqqM,7851
-lsst/ctrl/bps/htcondor/version.py,sha256=d9ENfpCeS2I77L3quCjEA1SqEJuEwmWi9q2wJwk_Xhw,54
+lsst/ctrl/bps/htcondor/version.py,sha256=G6JpKNKUlr1JgGmh_qq-VfLkVHObq8Mw0srMbfP1tiM,54
 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-28.2025.600.dist-info/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
-lsst_ctrl_bps_htcondor-28.2025.600.dist-info/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_ctrl_bps_htcondor-28.2025.600.dist-info/METADATA,sha256=Qi_uzDBdpvcXz6ltDPpoNAO_qvk2ecXtWTDEftvCzNU,2116
-lsst_ctrl_bps_htcondor-28.2025.600.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-lsst_ctrl_bps_htcondor-28.2025.600.dist-info/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_ctrl_bps_htcondor-28.2025.600.dist-info/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_ctrl_bps_htcondor-28.2025.600.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_ctrl_bps_htcondor-28.2025.600.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_ctrl_bps_htcondor-28.2025.600.dist-info/RECORD,,
+lsst_ctrl_bps_htcondor-28.2025.800.dist-info/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
+lsst_ctrl_bps_htcondor-28.2025.800.dist-info/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_ctrl_bps_htcondor-28.2025.800.dist-info/METADATA,sha256=7soxDJkTVA_cwW_7J9eHCzaoHIjz4vqMhUULzbD5z54,2116
+lsst_ctrl_bps_htcondor-28.2025.800.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+lsst_ctrl_bps_htcondor-28.2025.800.dist-info/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_ctrl_bps_htcondor-28.2025.800.dist-info/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_ctrl_bps_htcondor-28.2025.800.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_ctrl_bps_htcondor-28.2025.800.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_ctrl_bps_htcondor-28.2025.800.dist-info/RECORD,,