Merge branch 'dev' into jorlando/fix-missing-setuptools-dep

grafana · Aug 9, 2024 · c9d8346 · c9d8346
2 parents 201ff94 + 9b0c793
commit c9d8346
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/dev/scripts/generate-fake-data/requirements.txt b/dev/scripts/generate-fake-data/requirements.txt
@@ -1,3 +1,3 @@
-aiohttp==3.9.4
+aiohttp==3.10.2
 Faker==16.4.0
 tqdm==4.66.3
diff --git a/engine/apps/api/serializers/alert_receive_channel.py b/engine/apps/api/serializers/alert_receive_channel.py
@@ -8,7 +8,7 @@
 from jinja2 import TemplateSyntaxError
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
-from rest_framework.fields import SerializerMethodField, set_value
+from rest_framework.fields import SerializerMethodField
 
 from apps.alerts.grafana_alerting_sync_manager.grafana_alerting_sync import GrafanaAlertingSyncManager
 from apps.alerts.models import AlertReceiveChannel
@@ -632,7 +632,7 @@ def _handle_messaging_backend_updates(self, data, ret):
                         backend_updates[field] = value
             # update backend templates
             backend_templates.update(backend_updates)
-            set_value(ret, ["messaging_backends_templates", backend_id], backend_templates)
+            self.set_value(ret, ["messaging_backends_templates", backend_id], backend_templates)
 
         return errors
 
@@ -651,7 +651,7 @@ def _handle_core_template_updates(self, data, ret):
                     errors[field_name] = "invalid template"
                 except DjangoValidationError:
                     errors[field_name] = "invalid URL"
-                set_value(ret, [field_name], value)
+                self.set_value(ret, [field_name], value)
         return errors
 
     def to_representation(self, obj: "AlertReceiveChannel"):

diff --git a/engine/requirements.in b/engine/requirements.in
@@ -23,7 +23,7 @@ django-redis==5.4.0
 django-rest-polymorphic==0.1.10
 django-silk==5.0.3
 django-sns-view==0.1.2
-djangorestframework==3.14.0
+djangorestframework==3.15.2
 factory-boy<3.0
 drf-spectacular==0.26.5
 emoji==2.4.0

diff --git a/engine/requirements.txt b/engine/requirements.txt
@@ -136,7 +136,7 @@ django-silk==5.0.3
     # via -r requirements.in
 django-sns-view==0.1.2
     # via -r requirements.in
-djangorestframework==3.14.0
+djangorestframework==3.15.2
     # via
     #   -r requirements.in
     #   django-rest-polymorphic
@@ -370,7 +370,6 @@ python3-openid==3.2.0
 pytz==2024.1
     # via
     #   apscheduler
-    #   djangorestframework
     #   icalendar
     #   python-telegram-bot
     #   recurring-ical-events