lsst-ctrl-bps-htcondor 30.0.0rc2__py3-none-any.whl → 30.0.1rc1__py3-none-any.whl

lsst/ctrl/bps/htcondor/dagman_configurator.py

@@ -91,7 +91,7 @@ class DagmanConfigurator:
     ----------
     config : `lsst.ctrl.bps.BpsConfig`
         BPS configuration.
-    search_opts : `dict` [`str`, `Any`], optional
+    search_opts : `dict` [`str`, `~typing.Any`], optional
         Options to use while searching the BPS configuration for values.
 
     Raises

lsst/ctrl/bps/htcondor/htcondor_service.py

@@ -100,7 +100,7 @@ class HTCondorService(BaseWmsService):
 
         Returns
         -------
-        workflow : `lsst.ctrl.bps.wms.htcondor.HTCondorWorkflow`
+        workflow : `lsst.ctrl.bps.htcondor.HTCondorWorkflow`
             HTCondor workflow ready to be run.
         """
         _LOG.debug("out_prefix = '%s'", out_prefix)
@@ -141,7 +141,7 @@ class HTCondorService(BaseWmsService):
 
         Parameters
         ----------
-        workflow : `lsst.ctrl.bps.BaseWorkflow`
+        workflow : `lsst.ctrl.bps.htcondor.HTCondorWorkflow`
             A single HTCondor workflow to submit.  run_id is updated after
             successful submission to WMS.
         **kwargs : `~typing.Any`

lsst/ctrl/bps/htcondor/lssthtc.py

@@ -234,6 +234,7 @@ HTC_VALID_JOB_DAG_KEYS = {
     "retry_unless_exit",
     "abort_dag_on",
     "abort_exit",
+    "priority",
 }
 HTC_VERSION = version.parse(htcondor.__version__)
 
@@ -243,7 +244,7 @@ class RestrictedDict(MutableMapping):
 
     Parameters
     ----------
-    valid_keys : `Container`
+    valid_keys : `~collections.abc.Container`
         Strings that are valid keys.
     init_data : `dict` or `RestrictedDict`, optional
         Initial data.
@@ -490,7 +491,7 @@ def htc_write_attribs(stream, attrs):
 
     Parameters
     ----------
-    stream : `~io.TextIOBase`
+    stream : `~typing.TextIO`
         Output text stream (typically an open file).
     attrs : `dict`
         HTCondor job attributes (dictionary of attribute key, value).
@@ -512,7 +513,7 @@ def htc_write_condor_file(
 
     Parameters
     ----------
-    filename : `str` or os.PathLike
+    filename : `str` or `os.PathLike`
         Filename for the HTCondor submit file.
     job_name : `str`
         Job name to use in submit file.
@@ -823,7 +824,7 @@ def _htc_write_job_commands(stream, name, commands):
 
     Parameters
     ----------
-    stream : `~io.TextIOBase`
+    stream : `~typing.TextIO`
         Writeable text stream (typically an opened file).
     name : `str`
         Job name.
@@ -884,6 +885,12 @@ def _htc_write_job_commands(stream, name, commands):
             file=stream,
         )
 
+    if "priority" in commands and commands["priority"]:
+        print(
+            f"PRIORITY {name} {commands['priority']}",
+            file=stream,
+        )
+
 
 class HTCJob:
     """HTCondor job for use in building DAG.
@@ -974,7 +981,7 @@ class HTCJob:
 
         Parameters
         ----------
-        stream : `IO` or `str`
+        stream : `~typing.TextIO`
             Output Stream.
         dag_rel_path : `str`
             Relative path of dag to submit directory.
@@ -1002,7 +1009,7 @@ class HTCJob:
 
         Parameters
         ----------
-        fh : `~io.TextIOBase`
+        fh : `~typing.TextIO`
             Output stream.
         """
         printer = pprint.PrettyPrinter(indent=4, stream=fh)
@@ -1016,8 +1023,9 @@ class HTCDag(networkx.DiGraph):
 
     Parameters
     ----------
-    data : networkx.DiGraph.data
-        Initial graph.
+    data : `~typing.Any`
+        Initial graph data of any format that is supported
+        by the to_network_graph() function.
     name : `str`
         Name for DAG.
     """
@@ -1209,7 +1217,7 @@ class HTCDag(networkx.DiGraph):
 
         Parameters
         ----------
-        fh : `io.IO` or `str`
+        fh : `typing.IO`
             Where to dump DAG info as text.
         """
         for key, value in self.graph:
@@ -1296,7 +1304,7 @@ def condor_query(constraint=None, schedds=None, query_func=htc_query_present, **
         HTCondor schedulers which to query for job information. If None
         (default), the query will be run against the history file of
         the local scheduler only.
-    query_func : callable
+    query_func : `~collections.abc.Callable`
         An query function which takes following arguments:
 
         - ``schedds``: Schedulers to query (`list` [`htcondor.Schedd`]).
@@ -1653,7 +1661,7 @@ def read_dag_status(wms_path: str | os.PathLike) -> dict[str, Any]:
 
     Parameters
     ----------
-    wms_path : `str` or `os.PathLike
+    wms_path : `str` or `os.PathLike`
         Path that includes node status file for a run.
 
     Returns

lsst/ctrl/bps/htcondor/prepare_utils.py

@@ -306,7 +306,11 @@ def _translate_dag_cmds(gwjob):
         DAGMan commands for the job.
     """
     # Values in the dag script that just are name mappings.
-    dag_translation = {"abort_on_value": "abort_dag_on", "abort_return_value": "abort_exit"}
+    dag_translation = {
+        "abort_on_value": "abort_dag_on",
+        "abort_return_value": "abort_exit",
+        "priority": "priority",
+    }
 
     dagcmds = {}
     for gwkey, htckey in dag_translation.items():

lsst/ctrl/bps/htcondor/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "30.0.0rc2"
+__version__ = "30.0.1rc1"

{lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info → lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info}/METADATA

@@ -1,20 +1,20 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps-htcondor
-Version: 30.0.0rc2
+Version: 30.0.1rc1
 Summary: HTCondor plugin for lsst-ctrl-bps.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License-Expression: BSD-3-Clause OR GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/lsst/ctrl_bps_htcondor
+Project-URL: Source, https://github.com/lsst/ctrl_bps_htcondor
 Keywords: lsst
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering :: Astronomy
-Requires-Python: >=3.11.0
+Requires-Python: >=3.12.0
 Description-Content-Type: text/x-rst
 License-File: COPYRIGHT
 License-File: LICENSE

{lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info → lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info}/RECORD

@@ -1,24 +1,24 @@
 lsst/ctrl/bps/htcondor/__init__.py,sha256=8PVRtHS2tn_BDH9gnWQ-Fbg7o7wTbZoW7f41RGf0g7A,1450
 lsst/ctrl/bps/htcondor/common_utils.py,sha256=cHdPaOwS2I5T4RpGChdMAaqis7T3B2dR45zu8cVzpto,9744
-lsst/ctrl/bps/htcondor/dagman_configurator.py,sha256=YKqQr7_8sTMvrhorsQQEShxPNQTBFYI0vo62tpasihs,7231
+lsst/ctrl/bps/htcondor/dagman_configurator.py,sha256=9i57uOpIp11wyZesglNrphXbwM143RLG_Q9vhf6JIdo,7239
 lsst/ctrl/bps/htcondor/final_post.sh,sha256=chfaQV6Q7rGsK-8Hx58ch52m-PofvBanrl7VwCssHec,248
 lsst/ctrl/bps/htcondor/handlers.py,sha256=fkTEKulfwYOMofya9PzbvCiI9WNLfj_yTnno8Sm3srQ,14860
 lsst/ctrl/bps/htcondor/htcondor_config.py,sha256=c4lCiYEwEXFdxgbMfEkbDm4LrvkRMF31SqLtQqzqIV4,1523
-lsst/ctrl/bps/htcondor/htcondor_service.py,sha256=raGVthF4Q92B0VKeE5T1eNzOnmL6u4ni2Dcr3gThvd8,22671
+lsst/ctrl/bps/htcondor/htcondor_service.py,sha256=mExwdrvutIi4xtSPkYJtp4iPoZNnjILl37dQ5gKQJRw,22680
 lsst/ctrl/bps/htcondor/htcondor_workflow.py,sha256=wkANkAA4Ciq9WP_DWkjH2k0xWz9_i6gaNHWcxWQ4zkM,3071
-lsst/ctrl/bps/htcondor/lssthtc.py,sha256=2XVwlDByOHvOyB9yrjY_UJeoZgmh_OLVhg782PLC-fg,81485
-lsst/ctrl/bps/htcondor/prepare_utils.py,sha256=yjd31cG28zpvkDbyrI6gtRnkF2Wnzz_HzBEAyH_3zbs,36614
+lsst/ctrl/bps/htcondor/lssthtc.py,sha256=3_i8Ar2QmnAY9aVDMottr1Awwcr97PIa6n6Gjo83fJw,81772
+lsst/ctrl/bps/htcondor/prepare_utils.py,sha256=ID_TBn6taLcg4MCIhx8yygmGuIINhN4FO6ZG2z60kbY,36669
 lsst/ctrl/bps/htcondor/provisioner.py,sha256=DxhCOCpqyBXIBR2m8VL_FwaDMr2scQIOe8ArWjgQ_Ls,7929
 lsst/ctrl/bps/htcondor/report_utils.py,sha256=7idf6GRfMhCt5OuuCzHnnhPq5YVYm8k0bqS301MEjC8,31123
-lsst/ctrl/bps/htcondor/version.py,sha256=CrAQNQjb1NNXqaNvScI53U2GvkmrnpRtyOiy0bIrcl4,52
+lsst/ctrl/bps/htcondor/version.py,sha256=-auEgPcWk4qAWrWVMJY7Of7dAJ0dNQHoqQraCNdAEN4,52
 lsst/ctrl/bps/htcondor/etc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lsst/ctrl/bps/htcondor/etc/htcondor_defaults.yaml,sha256=0mIBmXBy5TBBtw1g6RL5TNjbnWM_ADeLp94r1-gfwAg,2061
-lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info/licenses/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
-lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info/METADATA,sha256=3Gr7mljE3xj1c9er2oIwggyqGmIl8RsMqJr-JHrrnIY,2297
-lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info/RECORD,,
+lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/licenses/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
+lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/METADATA,sha256=SZ1M-Jnidq2JiPlenV_TyNFsuKKJlFuph3xUVP6ODLI,2309
+lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/RECORD,,

{lsst_ctrl_bps_htcondor-30.0.0rc2.dist-info → lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info}/WHEEL

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