lsst-ctrl-bps-htcondor 30.0.1rc1__py3-none-any.whl → 30.2025.5100__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- lsst/ctrl/bps/htcondor/dagman_configurator.py +1 -1
- lsst/ctrl/bps/htcondor/htcondor_service.py +2 -2
- lsst/ctrl/bps/htcondor/lssthtc.py +11 -19
- lsst/ctrl/bps/htcondor/prepare_utils.py +1 -5
- lsst/ctrl/bps/htcondor/version.py +1 -1
- {lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info → lsst_ctrl_bps_htcondor-30.2025.5100.dist-info}/METADATA +3 -3
- lsst_ctrl_bps_htcondor-30.2025.5100.dist-info/RECORD +24 -0
- {lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info → lsst_ctrl_bps_htcondor-30.2025.5100.dist-info}/WHEEL +1 -1
- lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/RECORD +0 -24
- {lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info → lsst_ctrl_bps_htcondor-30.2025.5100.dist-info}/licenses/COPYRIGHT +0 -0
- {lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info → lsst_ctrl_bps_htcondor-30.2025.5100.dist-info}/licenses/LICENSE +0 -0
- {lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info → lsst_ctrl_bps_htcondor-30.2025.5100.dist-info}/licenses/bsd_license.txt +0 -0
- {lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info → lsst_ctrl_bps_htcondor-30.2025.5100.dist-info}/licenses/gpl-v3.0.txt +0 -0
- {lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info → lsst_ctrl_bps_htcondor-30.2025.5100.dist-info}/top_level.txt +0 -0
- {lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info → lsst_ctrl_bps_htcondor-30.2025.5100.dist-info}/zip-safe +0 -0
|
@@ -91,7 +91,7 @@ class DagmanConfigurator:
|
|
|
91
91
|
----------
|
|
92
92
|
config : `lsst.ctrl.bps.BpsConfig`
|
|
93
93
|
BPS configuration.
|
|
94
|
-
search_opts : `dict` [`str`,
|
|
94
|
+
search_opts : `dict` [`str`, `Any`], optional
|
|
95
95
|
Options to use while searching the BPS configuration for values.
|
|
96
96
|
|
|
97
97
|
Raises
|
|
@@ -100,7 +100,7 @@ class HTCondorService(BaseWmsService):
|
|
|
100
100
|
|
|
101
101
|
Returns
|
|
102
102
|
-------
|
|
103
|
-
workflow : `lsst.ctrl.bps.htcondor.HTCondorWorkflow`
|
|
103
|
+
workflow : `lsst.ctrl.bps.wms.htcondor.HTCondorWorkflow`
|
|
104
104
|
HTCondor workflow ready to be run.
|
|
105
105
|
"""
|
|
106
106
|
_LOG.debug("out_prefix = '%s'", out_prefix)
|
|
@@ -141,7 +141,7 @@ class HTCondorService(BaseWmsService):
|
|
|
141
141
|
|
|
142
142
|
Parameters
|
|
143
143
|
----------
|
|
144
|
-
workflow : `lsst.ctrl.bps.
|
|
144
|
+
workflow : `lsst.ctrl.bps.BaseWorkflow`
|
|
145
145
|
A single HTCondor workflow to submit. run_id is updated after
|
|
146
146
|
successful submission to WMS.
|
|
147
147
|
**kwargs : `~typing.Any`
|
|
@@ -234,7 +234,6 @@ HTC_VALID_JOB_DAG_KEYS = {
|
|
|
234
234
|
"retry_unless_exit",
|
|
235
235
|
"abort_dag_on",
|
|
236
236
|
"abort_exit",
|
|
237
|
-
"priority",
|
|
238
237
|
}
|
|
239
238
|
HTC_VERSION = version.parse(htcondor.__version__)
|
|
240
239
|
|
|
@@ -244,7 +243,7 @@ class RestrictedDict(MutableMapping):
|
|
|
244
243
|
|
|
245
244
|
Parameters
|
|
246
245
|
----------
|
|
247
|
-
valid_keys :
|
|
246
|
+
valid_keys : `Container`
|
|
248
247
|
Strings that are valid keys.
|
|
249
248
|
init_data : `dict` or `RestrictedDict`, optional
|
|
250
249
|
Initial data.
|
|
@@ -491,7 +490,7 @@ def htc_write_attribs(stream, attrs):
|
|
|
491
490
|
|
|
492
491
|
Parameters
|
|
493
492
|
----------
|
|
494
|
-
stream : `~
|
|
493
|
+
stream : `~io.TextIOBase`
|
|
495
494
|
Output text stream (typically an open file).
|
|
496
495
|
attrs : `dict`
|
|
497
496
|
HTCondor job attributes (dictionary of attribute key, value).
|
|
@@ -513,7 +512,7 @@ def htc_write_condor_file(
|
|
|
513
512
|
|
|
514
513
|
Parameters
|
|
515
514
|
----------
|
|
516
|
-
filename : `str` or
|
|
515
|
+
filename : `str` or os.PathLike
|
|
517
516
|
Filename for the HTCondor submit file.
|
|
518
517
|
job_name : `str`
|
|
519
518
|
Job name to use in submit file.
|
|
@@ -824,7 +823,7 @@ def _htc_write_job_commands(stream, name, commands):
|
|
|
824
823
|
|
|
825
824
|
Parameters
|
|
826
825
|
----------
|
|
827
|
-
stream : `~
|
|
826
|
+
stream : `~io.TextIOBase`
|
|
828
827
|
Writeable text stream (typically an opened file).
|
|
829
828
|
name : `str`
|
|
830
829
|
Job name.
|
|
@@ -885,12 +884,6 @@ def _htc_write_job_commands(stream, name, commands):
|
|
|
885
884
|
file=stream,
|
|
886
885
|
)
|
|
887
886
|
|
|
888
|
-
if "priority" in commands and commands["priority"]:
|
|
889
|
-
print(
|
|
890
|
-
f"PRIORITY {name} {commands['priority']}",
|
|
891
|
-
file=stream,
|
|
892
|
-
)
|
|
893
|
-
|
|
894
887
|
|
|
895
888
|
class HTCJob:
|
|
896
889
|
"""HTCondor job for use in building DAG.
|
|
@@ -981,7 +974,7 @@ class HTCJob:
|
|
|
981
974
|
|
|
982
975
|
Parameters
|
|
983
976
|
----------
|
|
984
|
-
stream :
|
|
977
|
+
stream : `IO` or `str`
|
|
985
978
|
Output Stream.
|
|
986
979
|
dag_rel_path : `str`
|
|
987
980
|
Relative path of dag to submit directory.
|
|
@@ -1009,7 +1002,7 @@ class HTCJob:
|
|
|
1009
1002
|
|
|
1010
1003
|
Parameters
|
|
1011
1004
|
----------
|
|
1012
|
-
fh : `~
|
|
1005
|
+
fh : `~io.TextIOBase`
|
|
1013
1006
|
Output stream.
|
|
1014
1007
|
"""
|
|
1015
1008
|
printer = pprint.PrettyPrinter(indent=4, stream=fh)
|
|
@@ -1023,9 +1016,8 @@ class HTCDag(networkx.DiGraph):
|
|
|
1023
1016
|
|
|
1024
1017
|
Parameters
|
|
1025
1018
|
----------
|
|
1026
|
-
data :
|
|
1027
|
-
Initial graph
|
|
1028
|
-
by the to_network_graph() function.
|
|
1019
|
+
data : networkx.DiGraph.data
|
|
1020
|
+
Initial graph.
|
|
1029
1021
|
name : `str`
|
|
1030
1022
|
Name for DAG.
|
|
1031
1023
|
"""
|
|
@@ -1217,7 +1209,7 @@ class HTCDag(networkx.DiGraph):
|
|
|
1217
1209
|
|
|
1218
1210
|
Parameters
|
|
1219
1211
|
----------
|
|
1220
|
-
fh : `
|
|
1212
|
+
fh : `io.IO` or `str`
|
|
1221
1213
|
Where to dump DAG info as text.
|
|
1222
1214
|
"""
|
|
1223
1215
|
for key, value in self.graph:
|
|
@@ -1304,7 +1296,7 @@ def condor_query(constraint=None, schedds=None, query_func=htc_query_present, **
|
|
|
1304
1296
|
HTCondor schedulers which to query for job information. If None
|
|
1305
1297
|
(default), the query will be run against the history file of
|
|
1306
1298
|
the local scheduler only.
|
|
1307
|
-
query_func :
|
|
1299
|
+
query_func : callable
|
|
1308
1300
|
An query function which takes following arguments:
|
|
1309
1301
|
|
|
1310
1302
|
- ``schedds``: Schedulers to query (`list` [`htcondor.Schedd`]).
|
|
@@ -1661,7 +1653,7 @@ def read_dag_status(wms_path: str | os.PathLike) -> dict[str, Any]:
|
|
|
1661
1653
|
|
|
1662
1654
|
Parameters
|
|
1663
1655
|
----------
|
|
1664
|
-
wms_path : `str` or `os.PathLike
|
|
1656
|
+
wms_path : `str` or `os.PathLike
|
|
1665
1657
|
Path that includes node status file for a run.
|
|
1666
1658
|
|
|
1667
1659
|
Returns
|
|
@@ -306,11 +306,7 @@ def _translate_dag_cmds(gwjob):
|
|
|
306
306
|
DAGMan commands for the job.
|
|
307
307
|
"""
|
|
308
308
|
# Values in the dag script that just are name mappings.
|
|
309
|
-
dag_translation = {
|
|
310
|
-
"abort_on_value": "abort_dag_on",
|
|
311
|
-
"abort_return_value": "abort_exit",
|
|
312
|
-
"priority": "priority",
|
|
313
|
-
}
|
|
309
|
+
dag_translation = {"abort_on_value": "abort_dag_on", "abort_return_value": "abort_exit"}
|
|
314
310
|
|
|
315
311
|
dagcmds = {}
|
|
316
312
|
for gwkey, htckey in dag_translation.items():
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
__all__ = ["__version__"]
|
|
2
|
-
__version__ = "30.
|
|
2
|
+
__version__ = "30.2025.5100"
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: lsst-ctrl-bps-htcondor
|
|
3
|
-
Version: 30.
|
|
3
|
+
Version: 30.2025.5100
|
|
4
4
|
Summary: HTCondor plugin for lsst-ctrl-bps.
|
|
5
5
|
Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
|
|
6
6
|
License-Expression: BSD-3-Clause OR GPL-3.0-or-later
|
|
7
7
|
Project-URL: Homepage, https://github.com/lsst/ctrl_bps_htcondor
|
|
8
|
-
Project-URL: Source, https://github.com/lsst/ctrl_bps_htcondor
|
|
9
8
|
Keywords: lsst
|
|
10
9
|
Classifier: Intended Audience :: Science/Research
|
|
11
10
|
Classifier: Operating System :: OS Independent
|
|
12
11
|
Classifier: Programming Language :: Python :: 3
|
|
12
|
+
Classifier: Programming Language :: Python :: 3.11
|
|
13
13
|
Classifier: Programming Language :: Python :: 3.12
|
|
14
14
|
Classifier: Programming Language :: Python :: 3.13
|
|
15
15
|
Classifier: Programming Language :: Python :: 3.14
|
|
16
16
|
Classifier: Topic :: Scientific/Engineering :: Astronomy
|
|
17
|
-
Requires-Python: >=3.
|
|
17
|
+
Requires-Python: >=3.11.0
|
|
18
18
|
Description-Content-Type: text/x-rst
|
|
19
19
|
License-File: COPYRIGHT
|
|
20
20
|
License-File: LICENSE
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
lsst/ctrl/bps/htcondor/__init__.py,sha256=8PVRtHS2tn_BDH9gnWQ-Fbg7o7wTbZoW7f41RGf0g7A,1450
|
|
2
|
+
lsst/ctrl/bps/htcondor/common_utils.py,sha256=cHdPaOwS2I5T4RpGChdMAaqis7T3B2dR45zu8cVzpto,9744
|
|
3
|
+
lsst/ctrl/bps/htcondor/dagman_configurator.py,sha256=YKqQr7_8sTMvrhorsQQEShxPNQTBFYI0vo62tpasihs,7231
|
|
4
|
+
lsst/ctrl/bps/htcondor/final_post.sh,sha256=chfaQV6Q7rGsK-8Hx58ch52m-PofvBanrl7VwCssHec,248
|
|
5
|
+
lsst/ctrl/bps/htcondor/handlers.py,sha256=fkTEKulfwYOMofya9PzbvCiI9WNLfj_yTnno8Sm3srQ,14860
|
|
6
|
+
lsst/ctrl/bps/htcondor/htcondor_config.py,sha256=c4lCiYEwEXFdxgbMfEkbDm4LrvkRMF31SqLtQqzqIV4,1523
|
|
7
|
+
lsst/ctrl/bps/htcondor/htcondor_service.py,sha256=raGVthF4Q92B0VKeE5T1eNzOnmL6u4ni2Dcr3gThvd8,22671
|
|
8
|
+
lsst/ctrl/bps/htcondor/htcondor_workflow.py,sha256=wkANkAA4Ciq9WP_DWkjH2k0xWz9_i6gaNHWcxWQ4zkM,3071
|
|
9
|
+
lsst/ctrl/bps/htcondor/lssthtc.py,sha256=2XVwlDByOHvOyB9yrjY_UJeoZgmh_OLVhg782PLC-fg,81485
|
|
10
|
+
lsst/ctrl/bps/htcondor/prepare_utils.py,sha256=yjd31cG28zpvkDbyrI6gtRnkF2Wnzz_HzBEAyH_3zbs,36614
|
|
11
|
+
lsst/ctrl/bps/htcondor/provisioner.py,sha256=DxhCOCpqyBXIBR2m8VL_FwaDMr2scQIOe8ArWjgQ_Ls,7929
|
|
12
|
+
lsst/ctrl/bps/htcondor/report_utils.py,sha256=7idf6GRfMhCt5OuuCzHnnhPq5YVYm8k0bqS301MEjC8,31123
|
|
13
|
+
lsst/ctrl/bps/htcondor/version.py,sha256=T_ii-AmyfLEzX_XiWTNw5GEFMy94NcXrbg2rkzKZg7g,55
|
|
14
|
+
lsst/ctrl/bps/htcondor/etc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
15
|
+
lsst/ctrl/bps/htcondor/etc/htcondor_defaults.yaml,sha256=0mIBmXBy5TBBtw1g6RL5TNjbnWM_ADeLp94r1-gfwAg,2061
|
|
16
|
+
lsst_ctrl_bps_htcondor-30.2025.5100.dist-info/licenses/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
|
|
17
|
+
lsst_ctrl_bps_htcondor-30.2025.5100.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
|
|
18
|
+
lsst_ctrl_bps_htcondor-30.2025.5100.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
|
|
19
|
+
lsst_ctrl_bps_htcondor-30.2025.5100.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
|
20
|
+
lsst_ctrl_bps_htcondor-30.2025.5100.dist-info/METADATA,sha256=JyGao_8_dPVJ9vp3pehTV3aZX7HzJc027NobI6LXFI4,2300
|
|
21
|
+
lsst_ctrl_bps_htcondor-30.2025.5100.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
22
|
+
lsst_ctrl_bps_htcondor-30.2025.5100.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
|
|
23
|
+
lsst_ctrl_bps_htcondor-30.2025.5100.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
24
|
+
lsst_ctrl_bps_htcondor-30.2025.5100.dist-info/RECORD,,
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
lsst/ctrl/bps/htcondor/__init__.py,sha256=8PVRtHS2tn_BDH9gnWQ-Fbg7o7wTbZoW7f41RGf0g7A,1450
|
|
2
|
-
lsst/ctrl/bps/htcondor/common_utils.py,sha256=cHdPaOwS2I5T4RpGChdMAaqis7T3B2dR45zu8cVzpto,9744
|
|
3
|
-
lsst/ctrl/bps/htcondor/dagman_configurator.py,sha256=9i57uOpIp11wyZesglNrphXbwM143RLG_Q9vhf6JIdo,7239
|
|
4
|
-
lsst/ctrl/bps/htcondor/final_post.sh,sha256=chfaQV6Q7rGsK-8Hx58ch52m-PofvBanrl7VwCssHec,248
|
|
5
|
-
lsst/ctrl/bps/htcondor/handlers.py,sha256=fkTEKulfwYOMofya9PzbvCiI9WNLfj_yTnno8Sm3srQ,14860
|
|
6
|
-
lsst/ctrl/bps/htcondor/htcondor_config.py,sha256=c4lCiYEwEXFdxgbMfEkbDm4LrvkRMF31SqLtQqzqIV4,1523
|
|
7
|
-
lsst/ctrl/bps/htcondor/htcondor_service.py,sha256=mExwdrvutIi4xtSPkYJtp4iPoZNnjILl37dQ5gKQJRw,22680
|
|
8
|
-
lsst/ctrl/bps/htcondor/htcondor_workflow.py,sha256=wkANkAA4Ciq9WP_DWkjH2k0xWz9_i6gaNHWcxWQ4zkM,3071
|
|
9
|
-
lsst/ctrl/bps/htcondor/lssthtc.py,sha256=3_i8Ar2QmnAY9aVDMottr1Awwcr97PIa6n6Gjo83fJw,81772
|
|
10
|
-
lsst/ctrl/bps/htcondor/prepare_utils.py,sha256=ID_TBn6taLcg4MCIhx8yygmGuIINhN4FO6ZG2z60kbY,36669
|
|
11
|
-
lsst/ctrl/bps/htcondor/provisioner.py,sha256=DxhCOCpqyBXIBR2m8VL_FwaDMr2scQIOe8ArWjgQ_Ls,7929
|
|
12
|
-
lsst/ctrl/bps/htcondor/report_utils.py,sha256=7idf6GRfMhCt5OuuCzHnnhPq5YVYm8k0bqS301MEjC8,31123
|
|
13
|
-
lsst/ctrl/bps/htcondor/version.py,sha256=-auEgPcWk4qAWrWVMJY7Of7dAJ0dNQHoqQraCNdAEN4,52
|
|
14
|
-
lsst/ctrl/bps/htcondor/etc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
15
|
-
lsst/ctrl/bps/htcondor/etc/htcondor_defaults.yaml,sha256=0mIBmXBy5TBBtw1g6RL5TNjbnWM_ADeLp94r1-gfwAg,2061
|
|
16
|
-
lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/licenses/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
|
|
17
|
-
lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
|
|
18
|
-
lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
|
|
19
|
-
lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
|
20
|
-
lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/METADATA,sha256=SZ1M-Jnidq2JiPlenV_TyNFsuKKJlFuph3xUVP6ODLI,2309
|
|
21
|
-
lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
|
|
22
|
-
lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
|
|
23
|
-
lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
24
|
-
lsst_ctrl_bps_htcondor-30.0.1rc1.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|