From 3f469b0b0a690dfc9b2a03f95d8cea5ea846e005 Mon Sep 17 00:00:00 2001
From: Arthur Hanson <worldnomad@gmail.com>
Date: Thu, 10 Oct 2024 06:08:58 -0700
Subject: [PATCH] 17476 Upgrade to Django 5.1 (#17620)

* 17476 Upgrade to Django 5.1

* 16136 fix migrations

* 17476 update remove GFK from fields

* 17476 fix

* 17476 update django to bugfix release

* fix comma
---
 netbox/extras/forms/bulk_import.py             | 2 +-
 netbox/extras/migrations/0002_squashed_0059.py | 4 ----
 netbox/extras/migrations/0087_squashed_0098.py | 5 ++---
 netbox/ipam/forms/model_forms.py               | 2 +-
 netbox/vpn/forms/model_forms.py                | 2 +-
 requirements.txt                               | 2 +-
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/netbox/extras/forms/bulk_import.py b/netbox/extras/forms/bulk_import.py
index 55c9cd764..258df8264 100644
--- a/netbox/extras/forms/bulk_import.py
+++ b/netbox/extras/forms/bulk_import.py
@@ -202,7 +202,7 @@ class EventRuleImportForm(NetBoxModelImportForm):
         model = EventRule
         fields = (
             'name', 'description', 'enabled', 'conditions', 'object_types', 'event_types', 'action_type',
-            'action_object', 'comments', 'tags'
+            'comments', 'tags'
         )
 
     def clean(self):
diff --git a/netbox/extras/migrations/0002_squashed_0059.py b/netbox/extras/migrations/0002_squashed_0059.py
index 98bed255a..a403a0e19 100644
--- a/netbox/extras/migrations/0002_squashed_0059.py
+++ b/netbox/extras/migrations/0002_squashed_0059.py
@@ -131,10 +131,6 @@ class Migration(migrations.Migration):
             name='webhook',
             unique_together={('payload_url', 'type_create', 'type_update', 'type_delete')},
         ),
-        migrations.AlterIndexTogether(
-            name='taggeditem',
-            index_together={('content_type', 'object_id')},
-        ),
         migrations.AlterUniqueTogether(
             name='exporttemplate',
             unique_together={('content_type', 'name')},
diff --git a/netbox/extras/migrations/0087_squashed_0098.py b/netbox/extras/migrations/0087_squashed_0098.py
index 55f276ecd..bbe7f79f5 100644
--- a/netbox/extras/migrations/0087_squashed_0098.py
+++ b/netbox/extras/migrations/0087_squashed_0098.py
@@ -98,10 +98,9 @@ class Migration(migrations.Migration):
             name='object_types',
             field=models.ManyToManyField(blank=True, related_name='+', to='contenttypes.contenttype'),
         ),
-        migrations.RenameIndex(
+        migrations.AddIndex(
             model_name='taggeditem',
-            new_name='extras_tagg_content_717743_idx',
-            old_fields=('content_type', 'object_id'),
+            index=models.Index(fields=['content_type', 'object_id'], name='extras_tagg_content_717743_idx'),
         ),
         migrations.CreateModel(
             name='Bookmark',
diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py
index f98f8b24f..156e7c435 100644
--- a/netbox/ipam/forms/model_forms.py
+++ b/netbox/ipam/forms/model_forms.py
@@ -591,7 +591,7 @@ class VLANGroupForm(NetBoxModelForm):
     class Meta:
         model = VLANGroup
         fields = [
-            'name', 'slug', 'description', 'vid_ranges', 'scope_type', 'scope', 'tags',
+            'name', 'slug', 'description', 'vid_ranges', 'scope_type', 'tags',
         ]
 
     def __init__(self, *args, **kwargs):
diff --git a/netbox/vpn/forms/model_forms.py b/netbox/vpn/forms/model_forms.py
index a17ca9a5e..dee98afd3 100644
--- a/netbox/vpn/forms/model_forms.py
+++ b/netbox/vpn/forms/model_forms.py
@@ -258,7 +258,7 @@ class TunnelTerminationForm(NetBoxModelForm):
     class Meta:
         model = TunnelTermination
         fields = [
-            'tunnel', 'role', 'termination', 'outside_ip', 'tags',
+            'tunnel', 'role', 'outside_ip', 'tags',
         ]
 
     def __init__(self, *args, initial=None, **kwargs):
diff --git a/requirements.txt b/requirements.txt
index c3d87e52f..fca329ccc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==5.0.9
+Django==5.1.2
 django-cors-headers==4.4.0
 django-debug-toolbar==4.4.6
 django-filter==24.3