lsst-ctrl-bps-htcondor 29.2025.3600__tar.gz → 29.2025.3800__tar.gz

{lsst_ctrl_bps_htcondor-29.2025.3600/python/lsst_ctrl_bps_htcondor.egg-info → lsst_ctrl_bps_htcondor-29.2025.3800}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps-htcondor
-Version: 29.2025.3600
+Version: 29.2025.3800
 Summary: HTCondor plugin for lsst-ctrl-bps.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_ctrl_bps_htcondor-29.2025.3600 → lsst_ctrl_bps_htcondor-29.2025.3800}/python/lsst/ctrl/bps/htcondor/htcondor_service.py

@@ -705,16 +705,16 @@ def _create_job(subdir_template, cached_values, generic_workflow, gwjob, out_pre
 
     htc_job_cmds.update(_translate_job_cmds(cached_values, generic_workflow, gwjob))
 
-    # job stdout, stderr, htcondor user log.
+    # Combine stdout and stderr to reduce the number of files.
     for key in ("output", "error"):
         if cached_values["overwriteJobFiles"]:
-            htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).{key[:3]}"
+            htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).out"
         else:
-            htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).$$([NumJobStarts ?: 0]).{key[:3]}"
+            htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).$$([NumJobStarts ?: 0]).out"
         _LOG.debug("HTCondor %s = %s", key, htc_job_cmds[key])
 
     key = "log"
-    htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).{key[:3]}"
+    htc_job_cmds[key] = f"{gwjob.name}.$(Cluster).{key}"
     _LOG.debug("HTCondor %s = %s", key, htc_job_cmds[key])
 
     htc_job_cmds.update(

{lsst_ctrl_bps_htcondor-29.2025.3600 → lsst_ctrl_bps_htcondor-29.2025.3800}/python/lsst/ctrl/bps/htcondor/lssthtc.py

@@ -530,7 +530,7 @@ def htc_write_condor_file(
                     print(f"{key}={value}", file=fh)
         for key in ["output", "error", "log"]:
             if key not in job:
-                filename = f"{job_name}.$(Cluster).${key[:3]}"
+                filename = f"{job_name}.$(Cluster).{'out' if key != 'log' else key}"
                 print(f"{key}={filename}", file=fh)
 
         if job_attrs is not None:

{lsst_ctrl_bps_htcondor-29.2025.3600 → lsst_ctrl_bps_htcondor-29.2025.3800}/python/lsst/ctrl/bps/htcondor/provisioner.py

@@ -194,8 +194,9 @@ class Provisioner:
             "getenv": "True",
         }
         cmds |= {
-            stream: str(job.subfile.with_suffix(f".$(Cluster).{stream[:3]}"))
-            for stream in ("output", "error", "log")
+            "output": str(job.subfile.with_suffix(".$(Cluster).out")),
+            "error": str(job.subfile.with_suffix(".$(Cluster).out")),
+            "log": str(job.subfile.with_suffix(".$(Cluster).log")),
         }
         job.add_job_cmds(cmds)
 

lsst_ctrl_bps_htcondor-29.2025.3800/python/lsst/ctrl/bps/htcondor/version.py

@@ -0,0 +1,2 @@
+__all__ = ["__version__"]
+__version__ = "29.2025.3800"

{lsst_ctrl_bps_htcondor-29.2025.3600 → lsst_ctrl_bps_htcondor-29.2025.3800/python/lsst_ctrl_bps_htcondor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps-htcondor
-Version: 29.2025.3600
+Version: 29.2025.3800
 Summary: HTCondor plugin for lsst-ctrl-bps.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_ctrl_bps_htcondor-29.2025.3600 → lsst_ctrl_bps_htcondor-29.2025.3800}/tests/test_htcondor_service.py

@@ -1577,6 +1577,10 @@ class CreateJobTestCase(unittest.TestCase):
         self.assertEqual(htc_job.label, gwjob.label)
         self.assertIn("NumJobStarts", htc_job.cmds["output"])
         self.assertIn("NumJobStarts", htc_job.cmds["error"])
+        self.assertNotIn("NumJobStarts", htc_job.cmds["log"])
+        self.assertTrue(htc_job.cmds["error"].endswith(".out"))
+        self.assertTrue(htc_job.cmds["output"].endswith(".out"))
+        self.assertTrue(htc_job.cmds["log"].endswith(".log"))
 
 
 if __name__ == "__main__":

{lsst_ctrl_bps_htcondor-29.2025.3600 → lsst_ctrl_bps_htcondor-29.2025.3800}/tests/test_lssthtc.py

@@ -1128,13 +1128,30 @@ class HtcWriteCondorFileTestCase(unittest.TestCase):
                 "environment": "one=1 two=\"2\" three='spacey 'quoted' value'",
                 "log": f"{job_name}.log",
             }
-
             job_attrs = {
                 "bps_job_name": job_name,
                 "bps_job_label": "label1",
                 "bps_job_quanta": "task1:8;task2:8",
             }
+            expected = [
+                "executable=$(CTRL_MPEXEC_DIR)/bin/pipetask\n",
+                "arguments=-a -b 2 -c\n",
+                "request_memory=2000\n",
+                "environment=\"one=1 two=\"2\" three='spacey 'quoted' value'\"\n",
+                f"output={job_name}.$(Cluster).out\n",
+                f"error={job_name}.$(Cluster).out\n",
+                f"log={job_name}.log\n",
+                f'+bps_job_name = "{job_name}"\n',
+                '+bps_job_label = "label1"\n',
+                '+bps_job_quanta = "task1:8;task2:8"\n',
+                "queue\n",
+            ]
+
             lssthtc.htc_write_condor_file(filename, job_name, job, job_attrs)
+            with open(filename, encoding="utf-8") as f:
+                actual = f.readlines()
+
+            self.assertEqual(set(actual), set(expected))
             self.assertTrue(filename.exists())
             # Try to make Submit object from file to find any syntax issues
             _ = lssthtc.htc_create_submit_from_file(filename)

{lsst_ctrl_bps_htcondor-29.2025.3600 → lsst_ctrl_bps_htcondor-29.2025.3800}/tests/test_provisioner.py

@@ -49,7 +49,7 @@ class ProvisionerTestCase(unittest.TestCase):
         pass
 
     def testConfigureWithoutExistingConfig(self):
-        """Test if configuration file is created if necessary."""
+        """Test if the configuration file is created if necessary."""
         with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as tmpdir:
             filename = f"{tmpdir}/condor-info.py"
             self.config[".provisioning.provisioningScriptConfig"] = "foo"
@@ -66,7 +66,7 @@ class ProvisionerTestCase(unittest.TestCase):
             self.assertTrue(provisioner.is_configured)
 
     def testConfigureWithExistingConfig(self):
-        """Test if existing configuration file is left unchanged."""
+        """Test if the existing configuration file is left unchanged."""
         with tempfile.NamedTemporaryFile(mode="w+", encoding="utf-8") as tmpfile:
             self.config[".provisioning.provisioningScriptConfig"] = "bar"
             self.config[".provisioning.provisioningScriptConfigPath"] = tmpfile.name
@@ -97,7 +97,7 @@ class ProvisionerTestCase(unittest.TestCase):
         self.assertTrue(provisioner.is_configured)
 
     def testConfigureOsError(self):
-        """Test if method raises when the configuration can't be created."""
+        """Test if the method raises when it can't create the configuration."""
         with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as tmpdir:
             filename = f"{tmpdir}/subdir/condor-info.py"
             self.config[".provisioning.provisioningScriptConfigPath"] = filename
@@ -112,7 +112,7 @@ class ProvisionerTestCase(unittest.TestCase):
             os.chmod(tmpdir, 0o700)
 
     def testPrepare(self):
-        """Test if provisioning script is created."""
+        """Test if the provisioning script is created."""
         with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as tmpdir:
             prov_config = Path(f"{tmpdir}/condor-info.py")
             self.config[".provisioning.provisioningScriptConfigPath"] = str(prov_config)
@@ -133,13 +133,13 @@ class ProvisionerTestCase(unittest.TestCase):
             self.assertEqual(prov_script.read_text(), "bar")
 
     def testPrepareIfNotConfigured(self):
-        """Test if method raises when the configuration step was skipped."""
+        """Test if the method raises when the configuration step is skipped."""
         provisioner = Provisioner(self.config)
         with self.assertRaises(RuntimeError):
             provisioner.prepare("provisioning_job.sh", prefix="")
 
     def testProvision(self):
-        """Test if provisioning job is added to the DAG."""
+        """Test if the provisioning job is added to the DAG."""
         script = Path("provisioningJob.sh")
         cmds = {
             "universe": "local",
@@ -147,7 +147,7 @@ class ProvisionerTestCase(unittest.TestCase):
             "should_transfer_files": "NO",
             "getenv": "True",
             "output": f"jobs/{script.stem}/{script.stem}.$(Cluster).out",
-            "error": f"jobs/{script.stem}/{script.stem}.$(Cluster).err",
+            "error": f"jobs/{script.stem}/{script.stem}.$(Cluster).out",
             "log": f"jobs/{script.stem}/{script.stem}.$(Cluster).log",
         }
         dag = HTCDag(name="default")
@@ -168,7 +168,7 @@ class ProvisionerTestCase(unittest.TestCase):
         self.assertIn("bps_provisioning_job", dag.graph["attr"])
 
     def testProvisionError(self):
-        """Test if method raises when the prepare step was skipped."""
+        """Test if the method raises when the prepare step was skipped."""
         dag = HTCDag(name="test")
         provisioner = Provisioner(self.config)
         with self.assertRaises(RuntimeError):

lsst_ctrl_bps_htcondor-29.2025.3600/python/lsst/ctrl/bps/htcondor/version.py

@@ -1,2 +0,0 @@
-__all__ = ["__version__"]
-__version__ = "29.2025.3600"