From b45e64ea58feb15cfb6567a5e5c534addb2ec8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Szulc?= Date: Fri, 6 Dec 2024 15:04:51 +0100 Subject: [PATCH] Django 2.2 --- requirements/base.txt | 10 +++++----- requirements/code_style.txt | 2 +- requirements/prod_ldap.txt | 2 +- src/ralph/admin/templates/admin/includes/favicon.html | 2 +- .../admin/templates/admin/includes/javascripts.html | 2 +- .../dc_view/templates/dc_view/angular_scripts.html | 2 +- src/ralph/lib/transitions/forms.py | 2 +- src/ralph/networks/fields.py | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 123a32a4c1..2cf5a33e47 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,6 +1,6 @@ -r openstack.txt -r hermes.txt -Django==2.1.15 +Django==2.2.28 Faker==0.9.0 Markdown<3.0 # headerid extension removed in 3.0 - see #3313 for details Pillow==6.2.2 @@ -18,16 +18,16 @@ django-sitetree==1.13.0 django-taggit-serializer==0.1.7 django-taggit==0.22.2 django-threadlocals==0.8 -djangorestframework==3.8.2 -djangorestframework_xml==1.2.0 -drf-nested-routers==0.11.1 +djangorestframework==3.13.1 +djangorestframework_xml==2.0.0 +drf-nested-routers==0.92.5 factory-boy==2.11.1 mysqlclient==1.3.13 netaddr==0.7.18 openpyxl==2.4.0 py-moneyed==1.2 python-dateutil==2.4.2 -pytz==2015.4 +pytz==2024.2 redis==3.2.1 requests-oauthlib==1.3.0 requests==2.20.0 diff --git a/requirements/code_style.txt b/requirements/code_style.txt index 52e99b140f..a261921910 100644 --- a/requirements/code_style.txt +++ b/requirements/code_style.txt @@ -1,3 +1,3 @@ -flake8==3.0.4 +flake8==3.7.9 isort==4.2.5 pyflakes==1.5.0 diff --git a/requirements/prod_ldap.txt b/requirements/prod_ldap.txt index db5ba301a8..99017457f4 100644 --- a/requirements/prod_ldap.txt +++ b/requirements/prod_ldap.txt @@ -1,2 +1,2 @@ -r prod.txt -django-auth-ldap==1.6.1 +django-auth-ldap==2.1.0 diff --git a/src/ralph/admin/templates/admin/includes/favicon.html b/src/ralph/admin/templates/admin/includes/favicon.html index 02a8b36bf1..6731e41738 100644 --- a/src/ralph/admin/templates/admin/includes/favicon.html +++ b/src/ralph/admin/templates/admin/includes/favicon.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %} diff --git a/src/ralph/admin/templates/admin/includes/javascripts.html b/src/ralph/admin/templates/admin/includes/javascripts.html index 64aee38634..5bd0aed4e9 100644 --- a/src/ralph/admin/templates/admin/includes/javascripts.html +++ b/src/ralph/admin/templates/admin/includes/javascripts.html @@ -1,4 +1,4 @@ -{% load staticfiles ralph_tags %} +{% load static ralph_tags %} diff --git a/src/ralph/dc_view/templates/dc_view/angular_scripts.html b/src/ralph/dc_view/templates/dc_view/angular_scripts.html index 7815f0841c..262f346471 100644 --- a/src/ralph/dc_view/templates/dc_view/angular_scripts.html +++ b/src/ralph/dc_view/templates/dc_view/angular_scripts.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %} diff --git a/src/ralph/lib/transitions/forms.py b/src/ralph/lib/transitions/forms.py index 1440643649..220d811820 100644 --- a/src/ralph/lib/transitions/forms.py +++ b/src/ralph/lib/transitions/forms.py @@ -2,7 +2,7 @@ from django import forms from django.conf import settings from django.utils.html import strip_tags -from django.utils.text import mark_safe +from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ from ralph.lib.transitions.models import ( diff --git a/src/ralph/networks/fields.py b/src/ralph/networks/fields.py index 94227fac20..cac8164f58 100644 --- a/src/ralph/networks/fields.py +++ b/src/ralph/networks/fields.py @@ -28,7 +28,7 @@ def db_type(self, connection): max_length=MAX_NETWORK_ADDRESS_LENGTH ).db_type(connection) - def from_db_value(self, value, expression, connection, context): + def from_db_value(self, value, expression, connection, *_, **__): if value is None: return value return ipaddress.ip_network(value)