From dec3ab5a53f9db9a2a2300743e437d13110836f4 Mon Sep 17 00:00:00 2001
From: kiblik <5609770+kiblik@users.noreply.github.com>
Date: Mon, 15 Dec 2025 13:54:36 +0100
Subject: [PATCH] feat(django): Upgrade to 6.0

Signed-off-by: kiblik <5609770+kiblik@users.noreply.github.com>
---
 dojo/settings/settings.dist.py | 19 -------------------
 requirements.txt               |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/dojo/settings/settings.dist.py b/dojo/settings/settings.dist.py
index 1f24bd653f..ea1fcd0ed7 100644
--- a/dojo/settings/settings.dist.py
+++ b/dojo/settings/settings.dist.py
@@ -2019,25 +2019,6 @@ def saml2_attrib_map_format(din):
 warnings.filterwarnings("ignore", message="polymorphic.base.ManagerInheritanceWarning.*")
 warnings.filterwarnings("ignore", message="PolymorphicModelBase._default_manager.*")
 
-
-# The setting is here to avoid RemovedInDjango60Warning. It is here only for transition period.
-# TODO: - Remove this setting in Django 6.0
-# TODO: More info:
-# Context:
-# uwsgi-1  |   File "/app/dojo/forms.py", line 515, in ImportScanForm
-# uwsgi-1  |     source_code_management_uri = forms.URLField(max_length=600, required=False, help_text="Resource link to source code")
-# uwsgi-1  |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-# uwsgi-1  |   File "/usr/local/lib/python3.11/site-packages/django/forms/fields.py", line 769, in __init__
-# uwsgi-1  |     warnings.warn(
-# uwsgi-1  | django.utils.deprecation.RemovedInDjango60Warning: The default scheme will be changed from 'http' to 'https' in Django 6.0. Pass the forms.URLField.assume_scheme argument to silence this warning, or set the FORMS_URLFIELD_ASSUME_HTTPS transitional setting to True to opt into using 'https' as the new default scheme.
-# +
-# uwsgi-1  |   File "/usr/local/lib/python3.11/site-packages/django/conf/__init__.py", line 214, in __init__
-# uwsgi-1  |     warnings.warn(
-# uwsgi-1  | django.utils.deprecation.RemovedInDjango60Warning: The FORMS_URLFIELD_ASSUME_HTTPS transitional setting is deprecated.
-warnings.filterwarnings("ignore", "The FORMS_URLFIELD_ASSUME_HTTPS transitional setting is deprecated.")
-FORMS_URLFIELD_ASSUME_HTTPS = True
-# Inspired by https://adamj.eu/tech/2023/12/07/django-fix-urlfield-assume-scheme-warnings/
-
 if DEBUG:
     # adding DEBUG logging for all of Django.
     LOGGING["loggers"]["root"] = {
diff --git a/requirements.txt b/requirements.txt
index e843402526..e6bdc11b68 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ django_extensions==4.1
 django-slack==5.19.0
 django-watson==1.6.3
 django-prometheus==2.4.1
-Django==5.2.9
+Django==6.0.0
 django-single-session==0.2.0
 djangorestframework==3.16.1
 html2text==2025.4.15