lsst-ctrl-execute 30.0.0__py3-none-any.whl → 30.0.0rc2__py3-none-any.whl

lsst/ctrl/execute/allocator.py

@@ -76,7 +76,7 @@ class Allocator:
         self.configuration = configuration
 
         condorInfoConfig = CondorInfoConfig()
-        condorInfoConfig.load(condorInfoFileName)
+        condorInfoConfig.loadFromStream(ResourcePath(condorInfoFileName).read())
 
         self.platform = platform
 
@@ -164,7 +164,7 @@ class Allocator:
         if not (name_ := ResourcePath(name)).exists():
             raise RuntimeError(f"{name_} was not found.")
         allocationConfig = AllocationConfig()
-        allocationConfig.load(name_)
+        allocationConfig.loadFromStream(name_.read())
 
         self.defaults["QUEUE"] = allocationConfig.platform.queue
         self.defaults["EMAIL_NOTIFICATION"] = allocationConfig.platform.email

lsst/ctrl/execute/condorInfoConfig.py

@@ -62,7 +62,7 @@ class CondorInfoConfig(pexConfig.Config):
 if __name__ == "__main__":
     config = CondorInfoConfig()
     filename = find_package_file("condor-info.py")
-    config.load(filename)
+    config.loadFromStream(filename.read())
 
     for i in config.platform:
         print(i)

lsst/ctrl/execute/findPackageFile.py

@@ -28,6 +28,7 @@
 import os
 import sys
 
+import lsst.utils
 from lsst.resources import ResourcePath
 
 
@@ -76,17 +77,21 @@ def find_package_file(filename: str, kind: str = "config", platform: str | None
 
     home_dir = os.getenv("HOME", "~")
     xdg_config_home = os.getenv("XDG_CONFIG_HOME", "~/.config")
+    try:
+        platform_pkg_dir = lsst.utils.getPackageDir(f"ctrl_platform_{platform}")
+    except (LookupError, ValueError):
+        platform_pkg_dir = None
 
     file_candidates = [
         ResourcePath(home_dir).join(".lsst").join(_filename),
         ResourcePath(xdg_config_home).join("lsst").join(_filename),
+        (ResourcePath(platform_pkg_dir).join("etc").join(kind).join(_filename) if platform_pkg_dir else None),
         ResourcePath(sys.exec_prefix).join("etc").join(kind).join(_filename),
         (
             ResourcePath(f"resource://lsst.ctrl.platform.{platform}/etc/{kind}/{_filename}")
             if platform
             else None
         ),
-        (ResourcePath(f"eups://ctrl_platform_{platform}/{kind}/{_filename}") if platform else None),
         ResourcePath(f"resource://lsst.ctrl.execute/etc/{kind}/{_filename}"),
     ]
     try:

lsst/ctrl/execute/libexec/allocateNodes.py

@@ -71,7 +71,7 @@ def main():
     # load the CondorConfig file
     execConfigName = find_package_file("execConfig.py", platform=platform)
     configuration = CondorConfig()
-    configuration.load(execConfigName)
+    configuration.loadFromStream(execConfigName.read())
 
     # create the plugin class
     schedulerName = configuration.platform.scheduler

lsst/ctrl/execute/qCommand.py

@@ -46,12 +46,12 @@ class QCommand:
         configFileName = find_package_file("condor-info.py")
 
         condorInfoConfig = CondorInfoConfig()
-        condorInfoConfig.load(configFileName)
+        condorInfoConfig.loadFromStream(configFileName.read())
 
         configName = find_package_file("pbsConfig.py", platform=platform)
 
         allocationConfig = AllocationConfig()
-        allocationConfig.load(configName)
+        allocationConfig.loadFromStream(configName.read())
 
         self.userName = condorInfoConfig.platform[platform].user.name
 

{lsst_ctrl_execute-30.0.0.dist-info → lsst_ctrl_execute-30.0.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-execute
-Version: 30.0.0
+Version: 30.0.0rc2
 Summary: Utilities for executing and managing workloads.
 Project-URL: Homepage, https://github.com/lsst/ctrl_execute
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
@@ -21,6 +21,6 @@ Classifier: Topic :: Scientific/Engineering :: Astronomy
 Requires-Python: >=3.11.0
 Requires-Dist: htcondor==24.0.*
 Requires-Dist: lsst-ctrl-bps-htcondor>=28.2024.5000; sys_platform == 'linux'
-Requires-Dist: lsst-pex-config>=30.2026.300
-Requires-Dist: lsst-resources>=30.2026.300
+Requires-Dist: lsst-pex-config
+Requires-Dist: lsst-resources
 Requires-Dist: lsst-utils

{lsst_ctrl_execute-30.0.0.dist-info → lsst_ctrl_execute-30.0.0rc2.dist-info}/RECORD

@@ -2,27 +2,27 @@ lsst/__init__.py,sha256=_2bZAHuDVAx7MM7KA7pt3DYp641NY4RzSoRAwesWKfU,67
 lsst/ctrl/__init__.py,sha256=_2bZAHuDVAx7MM7KA7pt3DYp641NY4RzSoRAwesWKfU,67
 lsst/ctrl/execute/__init__.py,sha256=3tOhxyhnHbwyLLGKmL13A_TGqKjNErHjJybplX9mPzw,1019
 lsst/ctrl/execute/allocationConfig.py,sha256=rcz_dHooE5SO59gr61vsO4ltvxl6G07JuPUdoUJLGXM,2828
-lsst/ctrl/execute/allocator.py,sha256=tzcPxYPiLxdsni5s38fQT0SQrYEmUwHjQh4S1goingk,17599
+lsst/ctrl/execute/allocator.py,sha256=MzBPM9RhSKtFlvaaX8XFKgrf9wJkHDBY0ehM8euBoHE,17647
 lsst/ctrl/execute/allocatorParser.py,sha256=g_0Bz6juTvVHv1oTPe6mbR3_nYc5-JmPAhmjzy1PORA,8368
 lsst/ctrl/execute/condorConfig.py,sha256=rZXs1HRUy0RgN3t73uy3hBLEzdU8zFHnFTXtUQ_0ynA,3060
-lsst/ctrl/execute/condorInfoConfig.py,sha256=Qazgi7V4I961QEoN7e8x8DD3iJs32_sF7XFZJov6w_w,2464
+lsst/ctrl/execute/condorInfoConfig.py,sha256=r0H3sVgyU9vTc4xkyxPBHf3AFNZM7j6rUhax5Fi_SOQ,2481
 lsst/ctrl/execute/envString.py,sha256=r15Xin2fagrxj2HyMfV4AFjNxjV9ITsJh10S69QJfEk,2044
-lsst/ctrl/execute/findPackageFile.py,sha256=prD8G_Nknn9Dt-LTkKdKHydXNtwGa2yYR-xRN7aO86g,3857
+lsst/ctrl/execute/findPackageFile.py,sha256=-Tis8RWbo-DxS8d8pROAULI0IqLcK1ElUaNZzoJaalY,4045
 lsst/ctrl/execute/namedClassFactory.py,sha256=8lUS0ONHjlXYjghe6wDOl2KWa0PaGs11lXCS77Z-5Zw,2147
 lsst/ctrl/execute/pbsPlugin.py,sha256=rn4lmp8dVWt726ALGErAXmDhAxvI2tsj1isJIOjsvAA,4267
-lsst/ctrl/execute/qCommand.py,sha256=8T0lb0rWPw0BizRSxAuV91pEIQlMcB6Tk4xJ_97D8x4,2799
+lsst/ctrl/execute/qCommand.py,sha256=lXB1GjXWaOqcyuFVLauAjyY-3-S7pMGgwgfcSBhJoAg,2833
 lsst/ctrl/execute/seqFile.py,sha256=D3qaNvxog1XLd3oE01pOQyaMgQTHdJtupZsx9MwUtnk,2417
 lsst/ctrl/execute/slurmPlugin.py,sha256=BJE8b2Hbc22PP5ggCT85P8yJgBAU0gMFOrR3ulxYiSs,21012
 lsst/ctrl/execute/templateWriter.py,sha256=PXxJ6aZ77oxcxa_Qk0D5a4kxaa2GFBxNJqSbZvcgmkk,2365
-lsst/ctrl/execute/libexec/allocateNodes.py,sha256=p4UdupnMPAN5FDmNgql4Rx8IOIM_YoSxAwbm-4e1P6U,2846
+lsst/ctrl/execute/libexec/allocateNodes.py,sha256=GCJdWY3j1E3_im3NpO08VK2q_v6AHfEYsuaO20eI8zE,2863
 lsst/ctrl/execute/libexec/dagIdInfo.py,sha256=U3jfrtkw2lw25QWRlLK4XuL_L29FqNm0D5Fy_F4ZJG4,1834
 lsst/ctrl/execute/libexec/qdelete.py,sha256=-YD1LnsKiePWXZhImoixx-Obx4GqN21m00MEgHSmnGc,1231
 lsst/ctrl/execute/libexec/qstatus.py,sha256=ds9JgLWFQ3nXHyXAPhXjdtSuiLvxxm1_YajH6I5xwcc,1572
-lsst_ctrl_execute-30.0.0.dist-info/METADATA,sha256=Yve_QkKbG9PFuX4H2CNApecokxfox26vHSx-VhPU3Bs,1078
-lsst_ctrl_execute-30.0.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-lsst_ctrl_execute-30.0.0.dist-info/entry_points.txt,sha256=pNyRrmyX0WVZfYRSfmuhm1vxOqk2np_7SQWxQ5DgB1A,242
-lsst_ctrl_execute-30.0.0.dist-info/licenses/COPYRIGHT,sha256=D8yy7vytJ840UEJroEZfgPlKU-OuMBsK7Wn2QZDaX-k,317
-lsst_ctrl_execute-30.0.0.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_ctrl_execute-30.0.0.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_ctrl_execute-30.0.0.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_ctrl_execute-30.0.0.dist-info/RECORD,,
+lsst_ctrl_execute-30.0.0rc2.dist-info/METADATA,sha256=1UH3IkDFX36lXaZALPd8USUj4LaPn4RuC-QiZwJOcBo,1055
+lsst_ctrl_execute-30.0.0rc2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+lsst_ctrl_execute-30.0.0rc2.dist-info/entry_points.txt,sha256=pNyRrmyX0WVZfYRSfmuhm1vxOqk2np_7SQWxQ5DgB1A,242
+lsst_ctrl_execute-30.0.0rc2.dist-info/licenses/COPYRIGHT,sha256=D8yy7vytJ840UEJroEZfgPlKU-OuMBsK7Wn2QZDaX-k,317
+lsst_ctrl_execute-30.0.0rc2.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_ctrl_execute-30.0.0rc2.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_ctrl_execute-30.0.0rc2.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_ctrl_execute-30.0.0rc2.dist-info/RECORD,,