Django 2.2

allegro · Dec 6, 2024 · b45e64e · b45e64e
1 parent 211d5f0
commit b45e64e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <link rel="apple-touch-icon-precomposed" sizes="57x57" href="{% static 'favicons/apple-touch-icon-57x57.png' %}" />
 <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% static 'favicons/apple-touch-icon-114x114.png' %}" />
 <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% static 'favicons/apple-touch-icon-72x72.png' %}" />

diff --git 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 %}
 
 <script type="text/javascript">window.__admin_utc_offset__ = "{% filter escapejs %}{% now "Z" %}{% endfilter %}";</script>
 <script type="text/javascript" src="{% static 'admin/js/core.js' %}"></script>

diff --git 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 %}
 
 <script src="{% static 'vendor/js/angular.min.js' %}"></script>
 <script src="{% static 'vendor/js/angular-resource.min.js' %}"></script>

diff --git 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
@@ -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)