Merge pull request #18 from lsst/tickets/DM-37836

DM-37836: bug fixes for ctrl_execute following initial testing
lsst · Feb 3, 2023 · 5c1d445 · 5c1d445
2 parents edcc419 + ee7828b
commit 5c1d445
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 5 deletions.
diff --git a/bin.src/dagIdInfo.py b/bin.src/dagIdInfo.py
@@ -29,7 +29,6 @@
 # extracts a line from a DAG file to show which ids were processed for a
 # particular dag node
 if __name__ == "__main__":
-
     if len(sys.argv) != 3:
         print("usage:  %s dagNodeName filename" % os.path.basename(sys.argv[0]))
         sys.exit(errno.EINVAL)

diff --git a/python/lsst/ctrl/execute/allocatorParser.py b/python/lsst/ctrl/execute/allocatorParser.py
@@ -143,7 +143,7 @@ def parseArgs(self, basename):
             action="store",
             dest="dynamic",
             type=str,
-            default=None,
+            default="__default__",
             help="configure to use dynamic/partitionable slot; legacy option: this is always enabled now",
         )
 

diff --git a/python/lsst/ctrl/execute/qCommand.py b/python/lsst/ctrl/execute/qCommand.py
@@ -33,7 +33,6 @@ class QCommand:
     """A class which wraps qsub-style commands for execution"""
 
     def __init__(self, platform):
-
         # can handle both grid-proxy and ssh logins
         self.remoteLoginCmd = "/usr/bin/gsissh"
 

diff --git a/python/lsst/ctrl/execute/slurmPlugin.py b/python/lsst/ctrl/execute/slurmPlugin.py
@@ -32,7 +32,6 @@
 
 class SlurmPlugin(Allocator):
     def submit(self, platform, platformPkgDir):
-
         configName = os.path.join(platformPkgDir, "etc", "config", "slurmConfig.py")
 
         self.loadSlurm(configName, platformPkgDir)

diff --git a/tests/test_allocationConfig.py b/tests/test_allocationConfig.py
@@ -35,7 +35,6 @@ def setUp(self):
         self.config = AllocationConfig()
 
     def test_config1(self):
-
         self.assertEqual(self.config.platform.queue, "debug")
         self.assertIsNone(self.config.platform.email)
         self.assertIsNone(self.config.platform.scratchDirectory)