lsst-ctrl-execute 30.0.0__tar.gz → 30.0.0rc2__tar.gz

{lsst_ctrl_execute-30.0.0 → lsst_ctrl_execute-30.0.0rc2}/.github/workflows/build.yaml

@@ -47,9 +47,8 @@ jobs:
 
       - name: Upload test results to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/codecov-action@v5
+        uses: codecov/test-results-action@v1
         with:
-          report_type: test_results
           token: ${{ secrets.CODECOV_TOKEN }}
 
   check-changes:

{lsst_ctrl_execute-30.0.0 → lsst_ctrl_execute-30.0.0rc2}/PKG-INFO

@@ -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 → lsst_ctrl_execute-30.0.0rc2}/pyproject.toml

@@ -21,8 +21,8 @@ keywords = ["lsst"]
 dependencies = [
     "htcondor ==24.0.*",
     "lsst-ctrl-bps-htcondor>=28.2024.5000; sys_platform == 'linux'",
-    "lsst-pex-config >= 30.2026.300",
-    "lsst-resources >= 30.2026.300",
+    "lsst-pex-config",
+    "lsst-resources",
     "lsst-utils",
 ]
 dynamic = ["version"]

{lsst_ctrl_execute-30.0.0 → lsst_ctrl_execute-30.0.0rc2}/python/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-30.0.0 → lsst_ctrl_execute-30.0.0rc2}/python/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-30.0.0 → lsst_ctrl_execute-30.0.0rc2}/python/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-30.0.0 → lsst_ctrl_execute-30.0.0rc2}/python/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-30.0.0 → lsst_ctrl_execute-30.0.0rc2}/python/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