Merge branch 'develop' into threading_check_current_request

CHANGELOG.rst

@@ -8,6 +8,7 @@ TBD
 - Expanded PublishClient to support Registering and Unregistering commands to Topics after a plugin has been initialized
 - Fixed bug where threading a SystemClient within a plugin lost current_request context and failed to map `requester`, 
   SystemClient will still drop the current_request context,but the requester field can be provided via `_requester`
+- Expanded Garden model to support tracking the version of Beer Garden running
 
 3.27.1
 ------

brewtils/models.py

@@ -1510,6 +1510,7 @@ def __init__(
         metadata=None,
         default_user=None,
         shared_users=None,
+        version="0.0.0",
     ):
         self.id = id
         self.name = name
@@ -1530,16 +1531,19 @@ def __init__(
         self.default_user = default_user
         self.shared_users = shared_users
 
+        self.version = version
+
     def __str__(self):
         return "%s" % self.name
 
     def __repr__(self):
         return (
-            "<Garden: garden_name=%s, status=%s, parent=%s, has_parent=%s, "
+            "<Garden: garden_name=%s, status=%s, version=%s, parent=%s, has_parent=%s, "
             "connection_type=%s, receiving_connections=%s, publishing_connections=%s>"
             % (
                 self.name,
                 self.status,
+                self.version,
                 self.parent,
                 self.has_parent,
                 self.connection_type,

brewtils/schemas.py

@@ -492,6 +492,7 @@ class GardenSchema(BaseSchema):
     metadata = fields.Dict(allow_none=True)
     default_user = fields.Str(allow_none=True)
     shared_users = fields.Bool(allow_none=True)
+    version = fields.Str(allow_none=True)
 
 
 class JobSchema(BaseSchema):

brewtils/test/fixtures.py

@@ -991,6 +991,7 @@ def garden_dict(
         "metadata": {},
         "default_user": None,
         "shared_users": True,
+        "version": "1.1.1",
     }