lsst-ctrl-bps-htcondor 29.2025.4200__tar.gz → 29.2025.4400__tar.gz

{lsst_ctrl_bps_htcondor-29.2025.4200/python/lsst_ctrl_bps_htcondor.egg-info → lsst_ctrl_bps_htcondor-29.2025.4400}/PKG-INFO

@@ -1,17 +1,18 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps-htcondor
-Version: 29.2025.4200
+Version: 29.2025.4400
 Summary: HTCondor plugin for lsst-ctrl-bps.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
-License: BSD 3-Clause License
+License-Expression: BSD-3-Clause OR GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/lsst/ctrl_bps_htcondor
 Keywords: lsst
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Requires-Python: >=3.11.0
 Description-Content-Type: text/x-rst

{lsst_ctrl_bps_htcondor-29.2025.4200 → lsst_ctrl_bps_htcondor-29.2025.4400}/pyproject.toml

@@ -6,18 +6,20 @@ build-backend = "setuptools.build_meta"
 name = "lsst-ctrl-bps-htcondor"
 requires-python = ">=3.11.0"
 description = "HTCondor plugin for lsst-ctrl-bps."
-license = {text = "BSD 3-Clause License"}
+license = "BSD-3-Clause OR GPL-3.0-or-later"
+license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"]
 readme = "README.rst"
 authors = [
     {name="Rubin Observatory Data Management", email="dm-admin@lists.lsst.org"},
 ]
 classifiers = [
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Scientific/Engineering :: Astronomy",
 ]
 keywords = ["lsst"]
@@ -43,7 +45,6 @@ where = ["python"]
 
 [tool.setuptools]
 zip-safe = true
-license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"]
 
 [tool.setuptools.package-data]
 "lsst.ctrl.bps.htcondor" = ["etc/*.yaml", "final_post.sh"]

{lsst_ctrl_bps_htcondor-29.2025.4200 → lsst_ctrl_bps_htcondor-29.2025.4400}/python/lsst/ctrl/bps/htcondor/report_utils.py

@@ -126,6 +126,7 @@ def _get_status_from_path(wms_path: str | os.PathLike) -> tuple[WmsStates, str]:
     if wms_workflow_id == MISSING_ID:
         state = WmsStates.UNKNOWN
     else:
+        htc_tweak_log_info(wms_path, dag_ad[wms_workflow_id])
         state = _htc_status_to_wms_state(dag_ad[wms_workflow_id])
 
     return state, message

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

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

{lsst_ctrl_bps_htcondor-29.2025.4200 → lsst_ctrl_bps_htcondor-29.2025.4400/python/lsst_ctrl_bps_htcondor.egg-info}/PKG-INFO

@@ -1,17 +1,18 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps-htcondor
-Version: 29.2025.4200
+Version: 29.2025.4400
 Summary: HTCondor plugin for lsst-ctrl-bps.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
-License: BSD 3-Clause License
+License-Expression: BSD-3-Clause OR GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/lsst/ctrl_bps_htcondor
 Keywords: lsst
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Requires-Python: >=3.11.0
 Description-Content-Type: text/x-rst

{lsst_ctrl_bps_htcondor-29.2025.4200 → lsst_ctrl_bps_htcondor-29.2025.4400}/tests/test_report_utils.py

@@ -842,21 +842,23 @@ class GetStatusFromPathTestCase(unittest.TestCase):
         self.assertEqual(state, WmsStates.UNKNOWN)
         self.assertEqual(message, f"DAGMan log not found in {fake_path}.  Check path.")
 
-    @unittest.mock.patch("lsst.ctrl.bps.htcondor.report_utils._htc_status_to_wms_state")
-    @unittest.mock.patch("lsst.ctrl.bps.htcondor.report_utils.read_dag_log")
-    def testSuccess(self, mock_read, mock_conversion):
-        dag_ads = {"100.0": {"JobStatus": lssthtc.JobStatus.COMPLETED, "ExitBySignal": False, "ExitCode": 0}}
-        mock_read.return_value = ("100.0", dag_ads)
-        mock_conversion.return_value = WmsStates.SUCCEEDED
+    def testSuccess(self):
+        with temporaryDirectory() as tmp_dir:
+            test_submit_dir = os.path.join(tmp_dir, "tiny_success")
+            copytree(f"{TESTDIR}/data/tiny_success", test_submit_dir)
+            state, message = report_utils._get_status_from_path(test_submit_dir)
 
-        fake_path = "/fake/path"
-        state, message = report_utils._get_status_from_path(fake_path)
+            self.assertEqual(state, WmsStates.SUCCEEDED)
+            self.assertEqual(message, "")
 
-        mock_read.assert_called_once_with(Path(fake_path))
-        mock_conversion.assert_called_once_with(dag_ads["100.0"])
+    def testFailure(self):
+        with temporaryDirectory() as tmp_dir:
+            test_submit_dir = os.path.join(tmp_dir, "tiny_problems")
+            copytree(f"{TESTDIR}/data/tiny_problems", test_submit_dir)
+            state, message = report_utils._get_status_from_path(test_submit_dir)
 
-        self.assertEqual(state, WmsStates.SUCCEEDED)
-        self.assertEqual(message, "")
+            self.assertEqual(state, WmsStates.FAILED)
+            self.assertEqual(message, "")
 
 
 if __name__ == "__main__":

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

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