Upgrading Dependencies

.github/workflows/pr-actions.yml

@@ -37,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         os: ['ubuntu-latest']
     name: PyTests OS ${{ matrix.os }} - Python ${{ matrix.python-version }}
     steps:

brewtils/models.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import copy
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
+from zoneinfo import ZoneInfo
 
-import pytz  # noqa # not in requirements file
 import six  # noqa # not in requirements file
 
 from brewtils.errors import ModelError, _deprecate
@@ -468,7 +468,7 @@ def __init__(self, heartbeat=None, history=None):
 
     def set_status_heartbeat(self, status, max_history=None):
 
-        self.heartbeat = datetime.utcnow()
+        self.heartbeat = datetime.now(timezone.utc)
         self.history.append(
             StatusHistory(status=copy.deepcopy(status), heartbeat=self.heartbeat)
         )
@@ -1264,7 +1264,7 @@ def __repr__(self):
 class DateTrigger(BaseModel):
     schema = "DateTriggerSchema"
 
-    def __init__(self, run_date=None, timezone=None):
+    def __init__(self, run_date=None, timezone="UTC"):
         self.run_date = run_date
         self.timezone = timezone
 
@@ -1280,9 +1280,10 @@ def scheduler_attributes(self):
 
     @property
     def scheduler_kwargs(self):
-        tz = pytz.timezone(self.timezone)
 
-        return {"timezone": tz, "run_date": tz.localize(self.run_date)}
+        tz = ZoneInfo(self.timezone.upper())
+
+        return {"timezone": tz, "run_date": self.run_date.replace(tzinfo=tz)}
 
 
 class IntervalTrigger(BaseModel):
@@ -1297,7 +1298,7 @@ def __init__(
         seconds=None,
         start_date=None,
         end_date=None,
-        timezone=None,
+        timezone="UTC",
         jitter=None,
         reschedule_on_finish=None,
     ):
@@ -1339,14 +1340,16 @@ def scheduler_attributes(self):
 
     @property
     def scheduler_kwargs(self):
-        tz = pytz.timezone(self.timezone)
+        tz = ZoneInfo(self.timezone.upper())
 
         kwargs = {key: getattr(self, key) for key in self.scheduler_attributes}
         kwargs.update(
             {
                 "timezone": tz,
-                "start_date": tz.localize(self.start_date) if self.start_date else None,
-                "end_date": tz.localize(self.end_date) if self.end_date else None,
+                "start_date": (
+                    self.start_date.replace(tzinfo=tz) if self.start_date else None
+                ),
+                "end_date": self.end_date.replace(tzinfo=tz) if self.end_date else None,
             }
         )
 
@@ -1368,7 +1371,7 @@ def __init__(
         second=None,
         start_date=None,
         end_date=None,
-        timezone=None,
+        timezone="UTC",
         jitter=None,
     ):
         self.year = year
@@ -1415,14 +1418,16 @@ def scheduler_attributes(self):
 
     @property
     def scheduler_kwargs(self):
-        tz = pytz.timezone(self.timezone)
+        tz = ZoneInfo(self.timezone.upper())
 
         kwargs = {key: getattr(self, key) for key in self.scheduler_attributes}
         kwargs.update(
             {
                 "timezone": tz,
-                "start_date": tz.localize(self.start_date) if self.start_date else None,
-                "end_date": tz.localize(self.end_date) if self.end_date else None,
+                "start_date": (
+                    self.start_date.replace(tzinfo=tz) if self.start_date else None
+                ),
+                "end_date": self.end_date.replace(tzinfo=tz) if self.end_date else None,
             }
         )
 

brewtils/schema_parser.py

@@ -370,9 +370,9 @@ def parse_job_ids(cls, job_id_json, from_string=False, **kwargs):
         schema = brewtils.schemas.JobExportInputSchema(**kwargs)
 
         if from_string:
-            return schema.loads(job_id_json).data
+            return schema.loads(job_id_json)
         else:
-            return schema.load(job_id_json).data
+            return schema.load(job_id_json)
 
     @classmethod
     def parse_garden(cls, garden, from_string=False, **kwargs):
@@ -561,7 +561,7 @@ def parse(
 
         schema.context["models"] = cls._models
 
-        return schema.loads(data).data if from_string else schema.load(data).data
+        return schema.loads(data) if from_string else schema.load(data)
 
     # Serialization methods
     @classmethod
@@ -1162,7 +1162,7 @@ def serialize(
 
             schema = getattr(brewtils.schemas, schema_name)(**kwargs)
 
-            return schema.dumps(model).data if to_string else schema.dump(model).data
+            return schema.dumps(model) if to_string else schema.dump(model)
 
         # Explicitly force to_string to False so only original call returns a string
         multiple = [