Skip to content

Commit dec3ab5

Browse files
committed
feat(django): Upgrade to 6.0
Signed-off-by: kiblik <5609770+kiblik@users.noreply.github.com>
1 parent 4c5de62 commit dec3ab5

2 files changed

Lines changed: 1 addition & 20 deletions

File tree

dojo/settings/settings.dist.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,25 +2019,6 @@ def saml2_attrib_map_format(din):
20192019
warnings.filterwarnings("ignore", message="polymorphic.base.ManagerInheritanceWarning.*")
20202020
warnings.filterwarnings("ignore", message="PolymorphicModelBase._default_manager.*")
20212021

2022-
2023-
# The setting is here to avoid RemovedInDjango60Warning. It is here only for transition period.
2024-
# TODO: - Remove this setting in Django 6.0
2025-
# TODO: More info:
2026-
# Context:
2027-
# uwsgi-1 | File "/app/dojo/forms.py", line 515, in ImportScanForm
2028-
# uwsgi-1 | source_code_management_uri = forms.URLField(max_length=600, required=False, help_text="Resource link to source code")
2029-
# uwsgi-1 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2030-
# uwsgi-1 | File "/usr/local/lib/python3.11/site-packages/django/forms/fields.py", line 769, in __init__
2031-
# uwsgi-1 | warnings.warn(
2032-
# 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.
2033-
# +
2034-
# uwsgi-1 | File "/usr/local/lib/python3.11/site-packages/django/conf/__init__.py", line 214, in __init__
2035-
# uwsgi-1 | warnings.warn(
2036-
# uwsgi-1 | django.utils.deprecation.RemovedInDjango60Warning: The FORMS_URLFIELD_ASSUME_HTTPS transitional setting is deprecated.
2037-
warnings.filterwarnings("ignore", "The FORMS_URLFIELD_ASSUME_HTTPS transitional setting is deprecated.")
2038-
FORMS_URLFIELD_ASSUME_HTTPS = True
2039-
# Inspired by https://adamj.eu/tech/2023/12/07/django-fix-urlfield-assume-scheme-warnings/
2040-
20412022
if DEBUG:
20422023
# adding DEBUG logging for all of Django.
20432024
LOGGING["loggers"]["root"] = {

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ django_extensions==4.1
1818
django-slack==5.19.0
1919
django-watson==1.6.3
2020
django-prometheus==2.4.1
21-
Django==5.2.9
21+
Django==6.0.0
2222
django-single-session==0.2.0
2323
djangorestframework==3.16.1
2424
html2text==2025.4.15

0 commit comments

Comments
 (0)