lsst-ctrl-execute 28.2025.500__tar.gz → 29.2025.1000__tar.gz

lsst_ctrl_execute-29.2025.1000/.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: check-yaml
+        args:
+          - "--unsafe"
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.9.6
+    hooks:
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-execute
-Version: 28.2025.500
+Version: 29.2025.1000
 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>

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/etc/configs/gordon_config.py

@@ -1,7 +1,5 @@
 # flake8: noqa
 config.platform.localScratch = "$HOME/condor_logs"
 config.platform.defaultRoot = "/oasis/scratch/ux453102/temp_project/lsst"
-config.platform.dataDirectory = (
-    "/oasis/scratch/ux453102/temp_project/lsst/stripe82/dr7/runs"
-)
+config.platform.dataDirectory = "/oasis/scratch/ux453102/temp_project/lsst/stripe82/dr7/runs"
 config.platform.fileSystemDomain = "sdsc.edu"

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/etc/scripts/generateDag.py

@@ -39,13 +39,11 @@ def makeArgumentParser(description, inRootsRequired=True, addRegistryOption=True
         description=description,
         fromfile_prefix_chars="@",
         formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog=" \n" "ly.",
+        epilog=" \nly.",
     )
     parser.convert_arg_line_to_args = _line_to_args
 
-    parser.add_argument(
-        "-s", "--source", dest="source", help="Source site for file transfer."
-    )
+    parser.add_argument("-s", "--source", dest="source", help="Source site for file transfer.")
 
     parser.add_argument("-w", "--workerdir", dest="workerdir", help="workers directory")
 
@@ -55,9 +53,7 @@ def makeArgumentParser(description, inRootsRequired=True, addRegistryOption=True
 
     parser.add_argument("-r", "--runid", dest="runid", help="runid of production")
 
-    parser.add_argument(
-        "-i", "--idsPerJob", dest="idsPerJob", help="number of ids to run per job"
-    )
+    parser.add_argument("-i", "--idsPerJob", dest="idsPerJob", help="number of ids to run per job")
 
     return parser
 
@@ -75,9 +71,7 @@ def writeMapInfo(output, count, newDataTotal, myDataTotal):
     output.write(count + "  " + myDataTotal + "\n")
 
 
-def writeDagFile(
-    pipeline, templateFile, infile, workerdir, prescriptFile, runid, idsPerJob
-):
+def writeDagFile(pipeline, templateFile, infile, workerdir, prescriptFile, runid, idsPerJob):
     """
     Write Condor Dag Submission files.
     """
@@ -102,7 +96,7 @@ def writeDagFile(
     configObj.write("DAGMAN_SUBMIT_DELAY=0\n")
     configObj.write("DAGMAN_USER_LOG_SCAN_INTERVAL=5\n")
 
-    outObj.write("CONFIG %s\n" % configname)
+    outObj.write(f"CONFIG {configname}\n")
     outObj.write("JOB A " + workerdir + "/" + pipeline + ".pre\n")
     outObj.write("JOB B " + workerdir + "/" + pipeline + ".post\n")
     outObj.write(" \n")
@@ -120,7 +114,7 @@ def writeDagFile(
     # A first pass through the Input File to define the individual Jobs
     # Loop over input entries
     #
-    fileObj = open(infile, "r")
+    fileObj = open(infile)
     count = 0
     acount = 0
     myDataTotal = ""
@@ -151,9 +145,7 @@ def writeDagFile(
 
         if acount == listSize:
             count += 1
-            outObj.write(
-                "JOB A" + str(count) + " " + workerdir + "/" + templateFile + "\n"
-            )
+            outObj.write("JOB A" + str(count) + " " + workerdir + "/" + templateFile + "\n")
             myDataTotal = " X ".join(myDataList)
             newDataTotal = "_".join(newDataList)
             writeVarsInfo(outObj, str(count), myDataTotal, visit, runid)

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/pyproject.toml

@@ -50,3 +50,61 @@ source = "lsst"
 
 [tool.hatch.build.targets.wheel]
 packages = ["python/lsst"]
+
+[tool.black]
+line-length = 110
+target-version = ["py311"]
+
+[tool.isort]
+profile = "black"
+line_length = 110
+known_first_party = ["lsst"]
+
+[tool.ruff]
+line-length = 110
+target-version = "py311"
+exclude = [
+    "__init__.py",
+]
+
+[tool.ruff.lint]
+ignore = [
+    "N802",
+    "N803",
+    "N806",
+    "N812",
+    "N815",
+    "N816",
+    "N999",
+    "D107",
+    "D105",
+    "D102",
+    "D104",
+    "D100",
+    "D200",
+    "D205",
+    "D400",
+]
+select = [
+    "E",  # pycodestyle
+    "F",  # pycodestyle
+    "N",  # pep8-naming
+    "W",  # pycodestyle
+    "UP",  # pyupgrade
+    "I",  # isort
+    "RUF022",  # sort __all__
+]
+
+[tool.ruff.lint.isort]
+known-first-party = ["lsst"]
+
+[tool.ruff.lint.pycodestyle]
+max-doc-length = 79
+
+[tool.ruff.lint.pydocstyle]
+convention = "numpy"
+
+[tool.ruff.format]
+docstring-code-format = true
+# Formatter does not know about indenting.
+docstring-code-line-length = 69

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/allocationConfig.py

@@ -26,9 +26,7 @@ import lsst.pex.config as pexConfig
 class AllocatedPlatformConfig(pexConfig.Config):
     """Platform specific information"""
 
-    queue = pexConfig.Field(
-        doc="the scheduler queue to submit to", dtype=str, default="debug"
-    )
+    queue = pexConfig.Field(doc="the scheduler queue to submit to", dtype=str, default="debug")
     email = pexConfig.Field(
         doc="line to add to the scheduler file to get email notification (if supported)",
         dtype=str,
@@ -40,15 +38,11 @@ class AllocatedPlatformConfig(pexConfig.Config):
         dtype=str,
         default=None,
     )
-    loginHostName = pexConfig.Field(
-        doc="the host to login and copy files to", dtype=str, default=None
-    )
+    loginHostName = pexConfig.Field(doc="the host to login and copy files to", dtype=str, default=None)
     utilityPath = pexConfig.Field(
         doc="the directory containing the scheduler commands", dtype=str, default=None
     )
-    totalCoresPerNode = pexConfig.Field(
-        doc="the TOTAL number of cores on each node", dtype=int, default=1
-    )
+    totalCoresPerNode = pexConfig.Field(doc="the TOTAL number of cores on each node", dtype=int, default=1)
     glideinShutdown = pexConfig.Field(
         doc="number of seconds of inactivity before glideins are cancelled",
         dtype=int,
@@ -64,6 +58,4 @@ class AllocationConfig(pexConfig.Config):
 
     # this is done on two levels instead of one for future expansion of this
     # config class, which may require local attributes to be specified.
-    platform = pexConfig.ConfigField(
-        "platform allocation information", AllocatedPlatformConfig
-    )
+    platform = pexConfig.ConfigField("platform allocation information", AllocatedPlatformConfig)

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/allocator.py

@@ -30,7 +30,9 @@ from datetime import datetime
 from string import Template
 
 from lsst.ctrl.execute.allocationConfig import AllocationConfig
+from lsst.ctrl.execute.condorConfig import CondorConfig
 from lsst.ctrl.execute.condorInfoConfig import CondorInfoConfig
+from lsst.ctrl.execute.findPackageFile import find_package_file
 from lsst.ctrl.execute.templateWriter import TemplateWriter
 from lsst.resources import ResourcePath, ResourcePathExpression
 
@@ -77,6 +79,10 @@ class Allocator:
 
         self.platform = platform
 
+        execConfigName = find_package_file("execConfig.py", platform=platform)
+        execConfig = CondorConfig()
+        execConfig.loadFromStream(execConfigName.read())
+
         # Look up the user's name and home and scratch directory in the
         # $HOME/.lsst/condor-info.py file
         user_name = None
@@ -91,18 +97,15 @@ class Allocator:
                     user_scratch = os.environ["SCRATCH"]
         if user_name is None:
             raise RuntimeError(
-                "error: %s does not specify user name for platform == %s"
-                % (condorInfoFileName, self.platform)
+                f"error: {condorInfoFileName} does not specify user name for platform == {self.platform}"
             )
         if user_home is None:
             raise RuntimeError(
-                "error: %s does not specify user home for platform == %s"
-                % (condorInfoFileName, self.platform)
+                f"error: {condorInfoFileName} does not specify user home for platform == {self.platform}"
             )
         if user_scratch is None:
             raise RuntimeError(
-                "error: %s does not specify user scratch for platform == %s"
-                % (condorInfoFileName, self.platform)
+                f"error: {condorInfoFileName} does not specify user scratch for platform == {self.platform}"
             )
         self.defaults["USER_NAME"] = user_name
         self.defaults["USER_HOME"] = user_home
@@ -111,7 +114,10 @@ class Allocator:
         self.commandLineDefaults["NODE_COUNT"] = self.opts.nodeCount
         self.commandLineDefaults["COLLECTOR"] = self.opts.collector
         self.commandLineDefaults["CPORT"] = self.opts.collectorport
-        self.commandLineDefaults["CPUS"] = self.opts.cpus
+        if self.opts.exclusive:
+            self.commandLineDefaults["CPUS"] = execConfig.platform.peakcpus
+        else:
+            self.commandLineDefaults["CPUS"] = self.opts.cpus
         self.commandLineDefaults["WALL_CLOCK"] = self.opts.maximumWallClock
         self.commandLineDefaults["ACCOUNT"] = self.opts.account
         self.commandLineDefaults["MEMPERCORE"] = 4096
@@ -135,20 +141,11 @@ class Allocator:
         # The tempfile.mkstemp method restricts the file to only the user,
         # and does not guarantee a file name can that easily be identified.
         now = datetime.now()
-        self.defaults["DATE_STRING"] = "%02d_%02d%02d" % (
-            now.year,
-            now.month,
-            now.day,
-        )
+        self.defaults["DATE_STRING"] = f"{now.year:02d}_{now.month:02d}{now.day:02d}"
         username = pwd.getpwuid(os.geteuid()).pw_name
-        ident = "%s_%02d_%02d%02d_%02d%02d%02d" % (
-            username,
-            now.year,
-            now.month,
-            now.day,
-            now.hour,
-            now.minute,
-            now.second,
+        ident = (
+            f"{username}_{now.year:02d}_{now.month:02d}{now.day:02d}_"
+            f"{now.hour:02d}{now.minute:02d}{now.second:02d}"
         )
         return ident
 
@@ -167,7 +164,7 @@ class Allocator:
         into data structures suitable for use by the TemplateWriter object.
         """
         if not (name_ := ResourcePath(name)).exists():
-            raise RuntimeError("%s was not found." % name_)
+            raise RuntimeError(f"{name_} was not found.")
         allocationConfig = AllocationConfig()
         allocationConfig.loadFromStream(name_.read())
 
@@ -178,9 +175,7 @@ class Allocator:
         self.defaults["UTILITY_PATH"] = allocationConfig.platform.utilityPath
 
         if self.opts.glideinShutdown is None:
-            self.defaults["GLIDEIN_SHUTDOWN"] = str(
-                allocationConfig.platform.glideinShutdown
-            )
+            self.defaults["GLIDEIN_SHUTDOWN"] = str(allocationConfig.platform.glideinShutdown)
         else:
             self.defaults["GLIDEIN_SHUTDOWN"] = str(self.opts.glideinShutdown)
 
@@ -198,9 +193,7 @@ class Allocator:
         # of the cores you intend to use.   In other words, the total available
         # on a machine, times the number of machines.
         totalCoresPerNode = allocationConfig.platform.totalCoresPerNode
-        self.commandLineDefaults["TOTAL_CORE_COUNT"] = (
-            self.opts.nodeCount * totalCoresPerNode
-        )
+        self.commandLineDefaults["TOTAL_CORE_COUNT"] = self.opts.nodeCount * totalCoresPerNode
 
         self.uniqueIdentifier = self.createUniqueIdentifier()
 
@@ -212,13 +205,9 @@ class Allocator:
             "configs",
         )
 
-        self.submitFileName = os.path.join(
-            self.configDir, "alloc_%s.%s" % (self.uniqueIdentifier, suffix)
-        )
+        self.submitFileName = os.path.join(self.configDir, f"alloc_{self.uniqueIdentifier}.{suffix}")
 
-        self.condorConfigFileName = os.path.join(
-            self.configDir, "condor_%s.config" % self.uniqueIdentifier
-        )
+        self.condorConfigFileName = os.path.join(self.configDir, f"condor_{self.uniqueIdentifier}.config")
 
         self.defaults["GENERATED_CONFIG"] = os.path.basename(self.condorConfigFileName)
         self.defaults["CONFIGURATION_ID"] = self.uniqueIdentifier
@@ -366,7 +355,11 @@ class Allocator:
         """Size of standard glideins for allocateNodes auto
         @return the value of autoCPUs
         """
-        return self.getParameter("AUTOCPUS")
+        if self.getParameter("EXCLUSIVE"):
+            peakcpus = self.configuration.platform.peakcpus
+            return peakcpus
+        else:
+            return self.getParameter("AUTOCPUS")
 
     def getWallClock(self):
         """Accessor for WALL_CLOCK
@@ -386,6 +379,18 @@ class Allocator:
         """
         return self.getParameter("RESERVATION")
 
+    def getExclusive(self):
+        """Accessor for EXCLUSIVE
+        @return the value of EXCLUSIVE
+        """
+        return self.getParameter("EXCLUSIVE")
+
+    def getExcluser(self):
+        """Accessor for EXCLUSER
+        @return the value of EXCLUSER
+        """
+        return self.getParameter("EXCLUSER")
+
     def getParameter(self, value):
         """Accessor for generic value
         @return None if value is not set.  Otherwise, use the command line
@@ -407,31 +412,22 @@ class Allocator:
             nodeString = "s"
         if self.opts.dynamic is None:
             print(
-                "%s glidein%s will be allocated on %s using default dynamic slots configuration."
-                % (nodes, nodeString, self.platform)
-            )
-            print(
-                "There will be %s cores per glidein and a maximum time limit of %s"
-                % (cpus, wallClock)
+                f"{nodes} glidein{nodeString} will be allocated on "
+                f"{self.platform} using default dynamic slots configuration."
             )
+            print(f"There will be {cpus} cores per glidein and a maximum time limit of {wallClock}")
         elif self.opts.dynamic == "__default__":
             print(
-                "%s glidein%s will be allocated on %s using default dynamic slots configuration."
-                % (nodes, nodeString, self.platform)
-            )
-            print(
-                "There will be %s cores per glidein and a maximum time limit of %s"
-                % (cpus, wallClock)
+                f"{nodes} glidein{nodeString} will be allocated on {self.platform} "
+                "using default dynamic slots configuration."
             )
+            print(f"There will be {cpus} cores per glidein and a maximum time limit of {wallClock}")
         else:
             print(
-                "%s node%s will be allocated on %s using dynamic slot block specified in '%s'"
-                % (nodes, nodeString, self.platform, self.opts.dynamic)
-            )
-            print(
-                "There will be  %s cores per node and maximum time limit of %s"
-                % (cpus, wallClock)
+                f"{nodes} node{nodeString} will be allocated on {self.platform} "
+                f"using dynamic slot block specified in '{self.opts.dynamic}'"
             )
+            print(f"There will be  {cpus} cores per node and maximum time limit of {wallClock}")
         print("Node set name:")
         print(self.getNodeSetName())
 

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/allocatorParser.py

@@ -57,9 +57,7 @@ class AllocatorParser:
         """
 
         parser = argparse.ArgumentParser(prog=basename)
-        parser.add_argument(
-            "platform", type=str, default="s3df", help="node allocation platform"
-        )
+        parser.add_argument("platform", type=str, default="s3df", help="node allocation platform")
         parser.add_argument(
             "--auto",
             action="store_true",
@@ -181,8 +179,23 @@ class AllocatorParser:
             help="encourage nodes to pack jobs rather than spread",
         )
         parser.add_argument(
-            "-v", "--verbose", action="store_true", dest="verbose", help="verbose"
+            "--exclusive",
+            action="store_true",
+            dest="exclusive",
+            default=None,
+            help="glidein will be an exclusive batch job; the glidein will be "
+            "the only job on the node, and have all available cores, memory."
+            "Settings for the number of cores -c are ignored, overridden.",
+        )
+        parser.add_argument(
+            "--exclusive-user",
+            action="store_true",
+            dest="exclusiveUser",
+            default=None,
+            help="glidein will be an exclusive to the user batch job; only "
+            " other jobs of the same user will share the node with the glidein",
         )
+        parser.add_argument("-v", "--verbose", action="store_true", dest="verbose", help="verbose")
         parser.add_argument(
             "-r",
             "--reservation",

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/condorConfig.py

@@ -28,30 +28,19 @@ import lsst.pex.config as pexConfig
 class PlatformConfig(pexConfig.Config):
     """Platform specific information"""
 
-    defaultRoot = pexConfig.Field(
-        doc="remote root for working directories", dtype=str, default=None
-    )
-    localScratch = pexConfig.Field(
-        doc="local Condor scratch directory", dtype=str, default=None
-    )
-    idsPerJob = pexConfig.Field(
-        doc="number of ids to work on per job", dtype=int, default=1
-    )
+    defaultRoot = pexConfig.Field(doc="remote root for working directories", dtype=str, default=None)
+    localScratch = pexConfig.Field(doc="local Condor scratch directory", dtype=str, default=None)
+    idsPerJob = pexConfig.Field(doc="number of ids to work on per job", dtype=int, default=1)
     dataDirectory = pexConfig.Field(
         doc="remote directory where date that jobs will use is kept",
         dtype=str,
         default=None,
     )
-    fileSystemDomain = pexConfig.Field(
-        doc="network domain name of remote system", dtype=str, default=None
-    )
-    eupsPath = pexConfig.Field(
-        doc="location of remote EUPS stack", dtype=str, default=None
-    )
-    nodeSetRequired = pexConfig.Field(
-        doc="is the nodeset required", dtype=bool, default=False
-    )
+    fileSystemDomain = pexConfig.Field(doc="network domain name of remote system", dtype=str, default=None)
+    eupsPath = pexConfig.Field(doc="location of remote EUPS stack", dtype=str, default=None)
+    nodeSetRequired = pexConfig.Field(doc="is the nodeset required", dtype=bool, default=False)
     scheduler = pexConfig.Field(doc="scheduler type", dtype=str, default=None)
+    peakcpus = pexConfig.Field(doc="peakcpus", dtype=int, default=None)
     manager = pexConfig.Field(doc="workflow manager", dtype=str, default=None)
     setup_using = pexConfig.Field(doc="environment setup type", dtype=str, default=None)
     manager_software_home = pexConfig.Field(

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/findPackageFile.py

@@ -28,9 +28,7 @@ import lsst.utils
 from lsst.resources import ResourcePath
 
 
-def find_package_file(
-    filename: str, kind: str = "config", platform: str | None = None
-) -> ResourcePath:
+def find_package_file(filename: str, kind: str = "config", platform: str | None = None) -> ResourcePath:
     """Find a package file from a set of candidate locations.
 
     Parameters
@@ -83,25 +81,17 @@ def find_package_file(
     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(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}"
-            )
+            ResourcePath(f"resource://lsst.ctrl.platform.{platform}/etc/{kind}/{_filename}")
             if platform
             else None
         ),
         ResourcePath(f"resource://lsst.ctrl.execute/etc/{kind}/{_filename}"),
     ]
     try:
-        found_file: ResourcePath = [
-            c for c in file_candidates if c is not None and c.exists()
-        ][0]
+        found_file: ResourcePath = [c for c in file_candidates if c is not None and c.exists()][0]
     except IndexError:
         raise FileNotFoundError(f"No file {filename} found in package file lookup")
     return found_file

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/libexec/allocateNodes.py

@@ -75,15 +75,11 @@ def main():
 
     # create the plugin class
     schedulerName = configuration.platform.scheduler
-    schedulerClass = NamedClassFactory.createClass(
-        "lsst.ctrl.execute." + schedulerName + "Plugin"
-    )
+    schedulerClass = NamedClassFactory.createClass("lsst.ctrl.execute." + schedulerName + "Plugin")
 
     # create the plugin
     condor_info_file = find_package_file("condor-info.py", platform=platform)
-    scheduler: Allocator = schedulerClass(
-        platform, p.getArgs(), configuration, condor_info_file
-    )
+    scheduler: Allocator = schedulerClass(platform, p.getArgs(), configuration, condor_info_file)
 
     # submit the request
     scheduler.submit()

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/libexec/dagIdInfo.py

@@ -31,17 +31,17 @@ import sys
 # particular dag node
 def main():
     if len(sys.argv) != 3:
-        print("usage:  %s dagNodeName filename" % os.path.basename(sys.argv[0]))
+        print(f"usage:  {os.path.basename(sys.argv[0])} dagNodeName filename")
         return errno.EINVAL
 
     dagNode = sys.argv[1]
     filename = sys.argv[2]
 
     if not os.path.exists(filename):
-        print("file %s not found" % filename)
+        print(f"file {filename} not found")
         return errno.ENOENT
 
-    ex = r"VARS %s var1=\"(?P<idlist>.+?)\"" % dagNode
+    ex = rf"VARS {dagNode} var1=\"(?P<idlist>.+?)\""
     with open(filename) as file:
         for line in file:
             line = line.rstrip(" \n")

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/libexec/qdelete.py

@@ -33,13 +33,7 @@ def main():
 
     cmd = QCommand(platform)
 
-    command = "%s %s@%s %s/qdel %s" % (
-        cmd.remoteLoginCmd,
-        cmd.userName,
-        cmd.hostName,
-        cmd.utilityPath,
-        jobId,
-    )
+    command = f"{cmd.remoteLoginCmd} {cmd.userName}@{cmd.hostName} {cmd.utilityPath}/qdel {jobId}"
     exitCode = cmd.runCommand(command)
     return exitCode
 

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/libexec/qstatus.py

@@ -35,15 +35,11 @@ def main():
 
     # default to doing a status for the user, otherwise, pass the args to qstat
     if len(sys.argv) == 2:
-        command = "%s %s@%s %s/qstat -u%s" % (
-            cmd.remoteLoginCmd,
-            cmd.userName,
-            cmd.hostName,
-            cmd.utilityPath,
-            cmd.userName,
+        command = (
+            f"{cmd.remoteLoginCmd} {cmd.userName}@{cmd.hostName} {cmd.utilityPath}/qstat -u{cmd.userName}"
         )
     else:
-        command = "%s %s@%s %s/qstat %s" % (
+        command = "{} {}@{} {}/qstat {}".format(
             cmd.remoteLoginCmd,
             cmd.userName,
             cmd.hostName,

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/namedClassFactory.py

@@ -35,6 +35,7 @@ class NamedClassFactory:
         an object of the specified name
     """
 
+    @staticmethod
     def createClass(name):
         dot = name.rindex(".")
         pack = name[0:dot]
@@ -45,13 +46,5 @@ class NamedClassFactory:
         module = __import__(name, globals(), locals(), [modname], 0)
         classobj = getattr(module, modname)
         if classobj is None:
-            raise RuntimeError(
-                'Attempt to instantiate class "'
-                + name
-                + '" failed. Could not find that class.'
-            )
+            raise RuntimeError(f"Attempt to instantiate class {name!r} failed. Could not find that class.")
         return classobj
-
-    # static method to createClasso
-
-    createClass = staticmethod(createClass)

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/pbsPlugin.py

@@ -45,14 +45,10 @@ class PbsPlugin(Allocator):
         self.loadPbs(configName)
         verbose = self.isVerbose()
 
-        pbsName = os.path.join(
-            platformPkgDir, "etc", "templates", "generic.pbs.template"
-        )
+        pbsName = os.path.join(platformPkgDir, "etc", "templates", "generic.pbs.template")
         generatedPbsFile = self.createPbsFile(pbsName)
 
-        condorFile = os.path.join(
-            platformPkgDir, "etc", "templates", "glidein_condor_config.template"
-        )
+        condorFile = os.path.join(platformPkgDir, "etc", "templates", "glidein_condor_config.template")
         generatedCondorConfigFile = self.createCondorConfigFile(condorFile)
 
         scratchDirParam = self.getScratchDirectory()
@@ -67,13 +63,9 @@ class PbsPlugin(Allocator):
         #
         # execute copy of PBS file to XSEDE node
         #
-        cmd = "%s %s %s@%s:%s/%s" % (
-            remoteCopyCmd,
-            generatedPbsFile,
-            userName,
-            hostName,
-            scratchDir,
-            os.path.basename(generatedPbsFile),
+        cmd = (
+            f"{remoteCopyCmd} {generatedPbsFile} "
+            f"{userName}@{hostName}:{scratchDir}/{os.path.basename(generatedPbsFile)}"
         )
         _LOG.debug(cmd)
         exitCode = self.runCommand(cmd, verbose)
@@ -84,13 +76,9 @@ class PbsPlugin(Allocator):
         #
         # execute copy of Condor config file to XSEDE node
         #
-        cmd = "%s %s %s@%s:%s/%s" % (
-            remoteCopyCmd,
-            generatedCondorConfigFile,
-            userName,
-            hostName,
-            scratchDir,
-            os.path.basename(generatedCondorConfigFile),
+        cmd = (
+            f"{remoteCopyCmd} {generatedCondorConfigFile} "
+            f"{userName}@{hostName}:{scratchDir}/{os.path.basename(generatedCondorConfigFile)}"
         )
         _LOG.debug(cmd)
         exitCode = self.runCommand(cmd, verbose)
@@ -101,13 +89,9 @@ class PbsPlugin(Allocator):
         #
         # execute qsub command on XSEDE node to perform Condor glide-in
         #
-        cmd = "%s %s@%s %s/qsub %s/%s" % (
-            remoteLoginCmd,
-            userName,
-            hostName,
-            utilityPath,
-            scratchDir,
-            os.path.basename(generatedPbsFile),
+        cmd = (
+            f"{remoteLoginCmd} {userName}@{hostName} "
+            f"{utilityPath}/qsub {scratchDir}/{os.path.basename(generatedPbsFile)}"
         )
         _LOG.debug(cmd)
         exitCode = self.runCommand(cmd, verbose)

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/slurmPlugin.py

@@ -31,6 +31,7 @@ from pathlib import Path
 from string import Template
 
 import htcondor
+
 from lsst.ctrl.bps.htcondor import condor_q
 from lsst.ctrl.execute.allocator import Allocator
 from lsst.ctrl.execute.findPackageFile import find_package_file
@@ -116,9 +117,7 @@ class SlurmPlugin(Allocator):
         template.substitute(USER_HOME=self.getUserHome())
 
         # create the slurm submit file
-        slurmName = find_package_file(
-            "generic.slurm.template", kind="templates", platform=self.platform
-        )
+        slurmName = find_package_file("generic.slurm.template", kind="templates", platform=self.platform)
         generatedSlurmFile = self.createSubmitFile(slurmName)
 
         # create the condor configuration file
@@ -128,9 +127,7 @@ class SlurmPlugin(Allocator):
         self.createCondorConfigFile(condorFile)
 
         # create the script that the slurm submit file calls
-        allocationName = find_package_file(
-            "allocation.sh.template", kind="templates", platform=self.platform
-        )
+        allocationName = find_package_file("allocation.sh.template", kind="templates", platform=self.platform)
         self.createAllocationFile(allocationName)
 
         _LOG.debug("The generated Slurm submit file is %s", generatedSlurmFile)
@@ -171,7 +168,7 @@ class SlurmPlugin(Allocator):
             self.glideinsFromJobPressure()
         else:
             generatedSlurmFile = self.createFilesFromTemplates()
-            cmd = "sbatch --mem %s %s" % (totalMemory, generatedSlurmFile)
+            cmd = f"sbatch --mem {totalMemory} {generatedSlurmFile}"
             nodes = self.getNodes()
             # In this case 'nodes' is the Target.
 
@@ -199,9 +196,7 @@ class SlurmPlugin(Allocator):
                 _LOG.error(e.output)
             strResult = result.decode("UTF-8")
 
-            _LOG.info(
-                "Detected this number of preexisting glidein jobs: %d", int(strResult)
-            )
+            _LOG.info("Detected this number of preexisting glidein jobs: %d", int(strResult))
 
             numberToAdd = nodes - int(strResult)
             _LOG.info("The number of glidein jobs to submit now is %d", numberToAdd)
@@ -215,14 +210,22 @@ class SlurmPlugin(Allocator):
 
     def loadSlurm(self, name):
         if self.opts.reservation is not None:
-            self.defaults["RESERVATION"] = (
-                "#SBATCH --reservation %s" % self.opts.reservation
-            )
+            self.defaults["RESERVATION"] = f"#SBATCH --reservation {self.opts.reservation}"
         else:
             self.defaults["RESERVATION"] = ""
 
+        if self.opts.exclusive is not None:
+            self.defaults["EXCLUSIVE"] = "#SBATCH --exclusive"
+        else:
+            self.defaults["EXCLUSIVE"] = ""
+
+        if self.opts.exclusiveUser is not None:
+            self.defaults["EXCLUSER"] = "#SBATCH --exclusive=user"
+        else:
+            self.defaults["EXCLUSER"] = ""
+
         if self.opts.qos:
-            self.defaults["QOS"] = "#SBATCH --qos %s" % self.opts.qos
+            self.defaults["QOS"] = f"#SBATCH --qos {self.opts.qos}"
         else:
             self.defaults["QOS"] = ""
 
@@ -232,9 +235,7 @@ class SlurmPlugin(Allocator):
         scratchDir = template.substitute(USER_SCRATCH=self.getUserScratch())
         self.defaults["SCRATCH_DIR"] = scratchDir
 
-        self.allocationFileName = (
-            Path(self.configDir) / f"allocation_{self.uniqueIdentifier}.sh"
-        )
+        self.allocationFileName = Path(self.configDir) / f"allocation_{self.uniqueIdentifier}.sh"
         self.defaults["GENERATED_ALLOCATE_SCRIPT"] = self.allocationFileName.name
 
         if self.opts.openfiles is None:
@@ -469,9 +470,7 @@ class SlurmPlugin(Allocator):
             if numberOfGlideinsReduced > maxSubmitGlideins:
                 numberOfGlideinsReduced = maxSubmitGlideins
                 _LOG.info("small: Reducing due to threshold.")
-            _LOG.debug(
-                "small: Number of Glideins to submit is %d", numberOfGlideinsReduced
-            )
+            _LOG.debug("small: Number of Glideins to submit is %d", numberOfGlideinsReduced)
 
             cpuopt = f"--cpus-per-task {autoCPUs}"
             memopt = f"--mem {memoryLimit}"

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/python/lsst/ctrl/execute/templateWriter.py

@@ -30,9 +30,7 @@ class TemplateWriter:
     write a new file with those values.
     """
 
-    def rewrite(
-        self, input: ResourcePathExpression, output: ResourcePathExpression, pairs
-    ):
+    def rewrite(self, input: ResourcePathExpression, output: ResourcePathExpression, pairs):
         """Given a input template, take the keys from key/values in the config
         object and substitute the values, and write those to the output file.
         @param input - the input template name

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/tests/test_condorConfig.py

@@ -49,9 +49,7 @@ class TestCondorConfig(lsst.utils.tests.TestCase):
         self.config.load(path)
 
         self.assertEqual(self.config.platform.defaultRoot, "/usr")
-        self.assertEqual(
-            self.config.platform.localScratch, "./tests/condor_scratch_condor"
-        )
+        self.assertEqual(self.config.platform.localScratch, "./tests/condor_scratch_condor")
         self.assertEqual(self.config.platform.dataDirectory, "/tmp/data_condor")
         self.assertEqual(self.config.platform.fileSystemDomain, "lsstcorp.org")
         self.assertEqual(self.config.platform.eupsPath, "/var/tmp")
@@ -90,9 +88,7 @@ class TestCondorConfig(lsst.utils.tests.TestCase):
         self.config.load(path)
 
         self.assertEqual(self.config.platform.defaultRoot, "/usr")
-        self.assertEqual(
-            self.config.platform.localScratch, "./tests/condor_scratch_slurm"
-        )
+        self.assertEqual(self.config.platform.localScratch, "./tests/condor_scratch_slurm")
         self.assertEqual(self.config.platform.dataDirectory, "/tmp/data_slurm")
         self.assertEqual(self.config.platform.fileSystemDomain, "lsstcorp.org")
         self.assertEqual(self.config.platform.eupsPath, "/var/tmp")

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/tests/test_dagIdInfo.py

@@ -44,19 +44,17 @@ class TestDagIdInfo(lsst.utils.tests.TestCase):
         execPath = "lsst.ctrl.execute.libexec.dagIdInfo"
         filename = os.path.join("tests", "testfiles", "test.diamond.dag")
 
-        stdout = self.executeCommand("%s -m %s A1 %s" % (exe, execPath, filename))
+        stdout = self.executeCommand(f"{exe} -m {execPath} A1 {filename}")
         self.assertEqual(stdout, "run=1033 filter=r camcol=2 field=229\n")
 
-        stdout = self.executeCommand("%s -m %s A3 %s" % (exe, execPath, filename))
+        stdout = self.executeCommand(f"{exe} -m {execPath} A3 {filename}")
         self.assertEqual(stdout, "run=1033 filter=i camcol=2 field=47\n")
 
-        stdout = self.executeCommand("%s -m %s A17 %s" % (exe, execPath, filename))
-        val = (
-            "run=1033 filter=r camcol=2 field=229 run=1033 filter=i camcol=2 field=47\n"
-        )
+        stdout = self.executeCommand(f"{exe} -m {execPath} A17 {filename}")
+        val = "run=1033 filter=r camcol=2 field=229 run=1033 filter=i camcol=2 field=47\n"
         self.assertEqual(stdout, val)
 
-        stdout = self.executeCommand("%s -m %s B1 %s" % (exe, execPath, filename))
+        stdout = self.executeCommand(f"{exe} -m {execPath} B1 {filename}")
         self.assertEqual(stdout, "")
 
 

{lsst_ctrl_execute-28.2025.500 → lsst_ctrl_execute-29.2025.1000}/tests/test_findPackageFile.py

@@ -1,4 +1,5 @@
 import pytest
+
 from lsst.ctrl.execute.findPackageFile import find_package_file
 
 

lsst_ctrl_execute-29.2025.1000/tests/test_slurmPlugin.py

@@ -0,0 +1,83 @@
+#
+# This file is part of daf_execute.
+#
+# Developed for the LSST Data Management System.
+# LSST Data Management System
+# Copyright 2008-2012 LSST Corporation.
+# This product includes software developed by the
+# LSST Project (http://www.lsst.org/).
+# # This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the LSST License Statement and
+# the GNU General Public License along with this program.  If not,
+# see <http://www.lsstcorp.org/LegalNotices/>.
+#
+
+import os.path
+import sys
+import unittest
+
+import lsst.utils.tests
+from lsst.ctrl.execute.allocatorParser import AllocatorParser
+from lsst.ctrl.execute.condorConfig import CondorConfig
+from lsst.ctrl.execute.namedClassFactory import NamedClassFactory
+
+
+def setup_module(module):
+    lsst.utils.tests.init()
+
+
+class SlurmPluginTest(lsst.utils.tests.TestCase):
+    def test1(self):
+        os.environ["SCRATCH"] = "/scratch/test1"
+        sys.argv = [
+            "test1",
+            "test_platform",
+            "-n",
+            "64",
+            "-c",
+            "12",
+            "-m",
+            "00:30:00",
+            "-q",
+            "normal",
+            "-O",
+            "outlog",
+            "-E",
+            "errlog",
+            "-v",
+        ]
+
+        al = AllocatorParser(sys.argv[0])
+        args = al.getArgs()
+
+        # create the plugin class
+        schedulerName = "slurm"
+
+        schedulerClass = NamedClassFactory.createClass("lsst.ctrl.execute." + schedulerName + "Plugin")
+
+        p0 = os.path.join("tests/testfiles", "config_condorInfo.py")
+        condor_info_file = p0
+
+        self.config = CondorConfig()
+        path = os.path.join("tests", "testfiles", "config_condor.py")
+        self.config.load(path)
+        self.assertEqual(self.config.platform.defaultRoot, "/usr")
+
+        self.assertTrue(schedulerClass)
+        self.assertTrue(args)
+        self.assertTrue(self.config)
+        self.assertTrue(condor_info_file)
+
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
+    unittest.main()

lsst_ctrl_execute-28.2025.500/.github/workflows/lint.yaml

@@ -1,11 +0,0 @@
-name: lint
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  call-workflow:
-    uses: lsst/rubin_workflows/.github/workflows/lint.yaml@main

lsst_ctrl_execute-28.2025.500/.pre-commit-config.yaml

@@ -1,27 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
-    hooks:
-      - id: check-yaml
-        args:
-          - "--unsafe"
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
-  - repo: https://github.com/psf/black
-    rev: 24.8.0
-    hooks:
-      - id: black
-        # It is recommended to specify the latest version of Python
-        # supported by your project here, or alternatively use
-        # pre-commit's default_language_version, see
-        # https://pre-commit.com/#top_level-default_language_version
-        language_version: python3.10
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        name: isort (python)
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
-    hooks:
-      - id: flake8