upgrade to Django 4.2 LTS, including all related package updates and required code compatibility updates

Author: hburgund

pyproject.toml

@@ -26,46 +26,46 @@ maintainers = [
 requires-python = ">=3.11"
 
 dependencies = [
-    "Django==3.0",
+    "Django>=4.2,<4.3",
     # Creates REST APIs
-    "djangorestframework",
+    "djangorestframework>=3.14,<3.16",
     # locks down access to api endpoints
     "django-dry-rest-permissions",
     # Used for DRF filtering
-    "django-filter<2.3",
+    "django-filter>=23.5",
     # Used in roundware/rw/admin.py, roundware/rw/forms.py, roundware/rw/views, and more.
-    "django-guardian==2.2.0",
+    "django-guardian>=3.0",
     # Used by roundware/api1/commands.py
-    "psutil==3.4.2",
+    "psutil>=7.0",
     # Used by roundware/rw/fields.py
     # django-validated-file==2.0.1
-    "python-magic==0.4.8",
+    "python-magic>=0.4.27",
     # Used in roundware/rw/views.py
     "django-braces==1.14.0",
     # Loaded in roundware/urls.py
     # django-adminplus==0.2.1
     # Used in roundware/rw/forms.py
-    "django-crispy-forms==1.9.1",
+    "django-crispy-forms>=2.0",
     # Used in roundware/rw/widgets.py
     "django-floppyforms==1.9.0",
     # Used in roundware/rw/views.py:
     "django-extra-views==0.13.0",
     # Used in roundware/rw/fields.py and roundware/rw/widgets.py
     "django-sortedm2m==3.1.1",
     # Required for RDF Date parsing
-    "python-dateutil==2.2",
+    "python-dateutil>=2.9",
     # Used in roundwared/icecast2.py
-    "requests<2.5",
+    "requests>=2.32",
     # Used in admin, including Batch Tag Add
     "django-formset-js==0.4.0",
     # database adapter for PostgreSQL
     "psycopg2",
     # geographic distance calculator utilities
     "geopy",
     # cors support to remove php layer
-    "django-cors-headers==3.3.0",
+    "django-cors-headers>=4.0",
     # geographic extensions for djangorestframework-gis
-    "djangorestframework-gis<=0.16",
+    "djangorestframework-gis>=1.0",
     # leaflet map utilities for django admin
     "django-leaflet",
     # Bootstrap admin theme for Django 1.9

requirements/common.txt

@@ -1,15 +1,15 @@
-Django==3.0
+Django>=4.2,<4.3
 # Creates REST APIs
 djangorestframework
 # Used for DRF filtering
-django-filter<2.3
+django-filter>=23.5
 # Used in roundware/rw/admin.py, roundware/rw/forms.py, roundware/rw/views, and more.
-django-guardian==2.2.0
+django-guardian>=3.0
 # Used by roundware/api1/commands.py
-psutil==3.4.2
+psutil>=7.0
 # Used by roundware/rw/fields.py
 # django-validated-file==2.0.1
-python-magic==0.4.8
+python-magic>=0.4.27
 # Used in roundware/rw/views.py
 django-braces==1.14.0
 # Loaded in roundware/urls.py
@@ -25,7 +25,7 @@ django-sortedm2m==3.1.1
 # Required for RDF Date parsing
 python-dateutil==2.2
 # Used in roundwared/icecast2.py
-requests<2.5
+requests>=2.32
 # Used in admin, including Batch Tag Add
 django-formset-js==0.4.0
 # database adapter for PostgreSQL

roundware/api1/urls.py

@@ -3,7 +3,7 @@
 
 
 from __future__ import unicode_literals
-from django.conf.urls import url, include
+from django.urls import re_path as url, include
 from roundware.api1 import views
 import logging
 logger = logging.getLogger(__name__)

roundware/api2/tests/test_serializers.py

@@ -809,7 +809,7 @@ def test_asset_serializer_with_all_fields():
     assert data['longitude'] == 20.0
     assert data['shape'] == {
         'type': 'MultiPolygon',
-        'coordinates': [[[[10.0, 20.0], [10.0, 20.1], [10.1, 20.1], [10.1, 20.0], [10.0, 20.0]]]]
+        'coordinates': [[[[20.0, 10.0], [20.1, 10.0], [20.1, 10.1], [20.0, 10.1], [20.0, 10.0]]]]
     }
 
 @pytest.mark.django_db

roundware/api2/tests/test_urls.py

@@ -19,7 +19,7 @@ def test_login_url():
     url = reverse('login')
     assert url == '/api/2/login/'
     resolver = resolve(url)
-    assert resolver.func.__name__ == 'ObtainAuthToken'
+    assert resolver.func.__name__ == 'view'  # In newer DRF, class-based views use 'view' as function name
 
 def test_available_urls():
     """Test that all expected URL patterns are available"""

roundware/api2/tests/test_views.py

@@ -149,7 +149,7 @@ def test_exception_handler_with_auth_header():
     exc.auth_header = 'Bearer realm="api"'
     response = exception_handler(exc, {})
     assert response.status_code == status.HTTP_401_UNAUTHORIZED
-    assert response._headers.get('www-authenticate', (None, None))[1] == 'Bearer realm="api"'
+    assert response.headers.get('www-authenticate') == 'Bearer realm="api"'
 
 # Test view methods
 def test_api_view_options_method(api_rf, sample_view):
@@ -235,8 +235,8 @@ def test_api_view_options_allowed_methods(api_rf, sample_view):
     request = api_rf.options('/')
     response = sample_view.dispatch(request)
     assert response.status_code == status.HTTP_200_OK
-    assert 'allow' in response._headers
-    allow_header = response._headers['allow'][1].split(', ')
+    assert 'allow' in response.headers
+    allow_header = response.headers['allow'].split(', ')
     assert 'GET' in allow_header
     assert 'POST' in allow_header
     assert 'OPTIONS' in allow_header
@@ -274,7 +274,7 @@ def head(self, request, *args, **kwargs):
     head_response = view.dispatch(head_request)
 
     assert head_response.status_code == get_response.status_code
-    assert head_response._headers == get_response._headers
+    assert dict(head_response.headers) == dict(get_response.headers)
     assert head_response.content == b''
 
 @pytest.mark.django_db
@@ -859,9 +859,9 @@ def get(self, request):
 
     response = view.finalize_response(request, Response({'message': 'test'}))
 
-    assert 'vary' in response._headers
-    assert 'Accept-Version' in response._headers['vary'][1]
-    assert response._headers['custom-header'][1] == 'Value'
+    assert 'vary' in response.headers
+    assert 'Accept-Version' in response.headers['vary']
+    assert response.headers['custom-header'] == 'Value'
 
 # Test Versioning
 class CustomURLVersioning(versioning.BaseVersioning):
@@ -1041,8 +1041,8 @@ def get(self, request, *args, **kwargs):
     request = api_rf.get('/test/')
     response = view.dispatch(request)
 
-    assert 'allow' in response._headers
-    assert 'GET, OPTIONS' in response._headers['allow'][1]
+    assert 'allow' in response.headers
+    assert 'GET, OPTIONS' in response.headers['allow']
 
 @pytest.mark.django_db
 def test_dispatch_with_custom_headers(api_rf):
@@ -1058,8 +1058,8 @@ def get(self, request, *args, **kwargs):
     request = api_rf.get('/test/')
     response = view.dispatch(request)
 
-    assert 'custom-header' in response._headers
-    assert response._headers['custom-header'][1] == 'test-value'
+    assert 'custom-header' in response.headers
+    assert response.headers['custom-header'] == 'test-value'
 
 # Test raise_uncaught_exception method
 @pytest.mark.django_db
@@ -1251,7 +1251,7 @@ def custom_handler(exc, context):
     assert response.status_code == status.HTTP_400_BAD_REQUEST
     assert response.data == {'detail': 'Custom error', 'extra': 'data'}
     assert response.exception is True
-    assert response._headers['custom-header'] == ('Custom-Header', 'test')
+    assert response.headers['custom-header'] == 'test'
 
 # Test exception handler and context logic (lines 456-461)
 @pytest.mark.django_db
@@ -2039,13 +2039,13 @@ def get(self, request, *args, **kwargs):
     final_response = view.finalize_response(request, response)
 
     # Verify Vary headers were properly handled
-    assert 'vary' in final_response._headers
-    vary_value = final_response._headers['vary'][1]
+    assert 'vary' in final_response.headers
+    vary_value = final_response.headers['vary']
     assert 'Accept-Language' in vary_value
     assert 'Cookie' in vary_value
 
     # Verify other headers were set
-    assert final_response._headers['custom-header'] == ('Custom-Header', 'test-value')
+    assert final_response.headers['custom-header'] == 'test-value'
 
 def test_finalize_response_multiple_vary_merging():
     """Test finalize_response merging multiple Vary headers."""
@@ -2077,8 +2077,8 @@ def get(self, request, *args, **kwargs):
     final_response = view.finalize_response(request, response)
 
     # Verify all Vary headers were merged
-    assert 'vary' in final_response._headers
-    vary_value = final_response._headers['vary'][1]
+    assert 'vary' in final_response.headers
+    vary_value = final_response.headers['vary']
     assert 'Accept' in vary_value
     assert 'Accept-Language' in vary_value
     assert 'Cookie' in vary_value
@@ -2106,8 +2106,8 @@ def get(self, request, *args, **kwargs):
     final_response = view.finalize_response(request, response)
 
     # Verify headers were added to HttpResponse
-    assert final_response._headers['custom-header'] == ('Custom-Header', 'test-value')
-    assert 'Accept-Language' in final_response._headers['vary'][1]
+    assert final_response.headers['custom-header'] == 'test-value'
+    assert 'Accept-Language' in final_response.headers['vary']
 
 def test_handle_exception_not_authenticated_with_auth_header():
     """Test handle_exception with NotAuthenticated and WWW-Authenticate header."""

roundware/api2/urls.py

@@ -3,7 +3,7 @@
 
 
 from __future__ import unicode_literals
-from django.conf.urls import url, include
+from django.urls import re_path as url, include
 from rest_framework.routers import DefaultRouter
 from rest_framework.authtoken import views as rest_framework_views
 from roundware.api2 import views

roundware/rw/apps.py

@@ -3,5 +3,5 @@
 
 
 class RoundwareConfig(AppConfig):
-    name = "rw"
+    name = "roundware.rw"
     verbose_name = "Roundware Core"

roundware/rw/fields.py

@@ -18,7 +18,7 @@ def clean(self, value):
 from django.db import models
 from django import forms
 from django.template.defaultfilters import filesizeformat
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 import magic
 

roundware/rw/filters.py

@@ -5,8 +5,8 @@
 from django.contrib.admin import DateFieldListFilter, RelatedFieldListFilter
 from django.contrib.admin.utils import (get_model_from_relation,
                                        prepare_lookup_value)
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import smart_str
+from django.utils.translation import gettext_lazy as _
 
 from roundware.rw.models import Tag, TagCategory
 
@@ -121,6 +121,6 @@ def choices(self, cl):
                'query_string': cl.get_query_string({}, [self.lookup_kwarg]),
                'display': _('All')}
         for val in self.lookup_choices:
-            yield {'selected': smart_text(val) == self.lookup_val,
+            yield {'selected': smart_str(val) == self.lookup_val,
                    'query_string': cl.get_query_string({self.lookup_kwarg: val}),
                    'display': val}