Merging deb/5.1.2-1 into 5.2.0

psconfig/perfsonar-psconfig/psconfig/base_agent.py

@@ -256,7 +256,7 @@ def run(self):
 
         for transform_file in transform_files:
             log_ctx = {"transform_file" : transform_file}
-            self.logger.debug(self.logf.format("Loading transform file {}".format(archive_file), log_ctx))
+            self.logger.debug(self.logf.format("Loading transform file {}".format(transform_file), log_ctx))
 
             transform_client = TransformConnect(url=transform_file)
             transform = transform_client.get_config()
@@ -697,4 +697,4 @@ def validate(self):
             validator = jsonvalidate(instance=self.data, schema=schema)
             return []
         except Exception as e:
-            return [e]
+            return [e]

psconfig/perfsonar-psconfig/psconfig/client/pscheduler/task_manager.py

@@ -3,14 +3,14 @@
 '''
 
 import os
+import isodate
 import json
 import time
 import uuid
 from ...utilities.iso8601 import duration_to_seconds
 from .api_filters import ApiFilters
 from .api_connect import ApiConnect
 import datetime
-from dateutil.parser import isoparse
 from ...utilities.logging_utils import LoggingUtils
 import logging
 
@@ -533,9 +533,7 @@ def _iso_to_ts(self, iso_str):
             return
 
         #ensure no microseconds for strptime to work
-        dt = isoparse(iso_str)
-        return dt.timestamp()
-
+        return isodate.parse_datetime(iso_str).timestamp()
 
     def _ts_to_iso(self, ts):
         if not ts:

psconfig/perfsonar-psconfig/unibuild-packaging/deb/changelog

@@ -4,6 +4,12 @@ perfsonar-psconfig (5.2.0~a1.0-1) perfsonar-5.2-snapshot; urgency=low
 
  -- perfSONAR developers <[email protected]>  Tue, 11 Jun 2024 18:27:11 +0200
 
+perfsonar-psconfig (5.1.2-1) perfsonar-5.1; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 19 Jul 2024 14:36:16 -0400
+
 perfsonar-psconfig (5.1.1-1) perfsonar-5.1; urgency=low
 
   * New upstream version.