Make compatible with Django 4.2 (fixes DEV-51)

enhydris/admin/__init__.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from parler.admin import TranslatableAdmin
 

enhydris/admin/garea.py

@@ -13,7 +13,7 @@
 from django.http import HttpResponseRedirect
 from django.template.response import TemplateResponse
 from django.urls import path
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from enhydris import models
 

enhydris/admin/station.py

@@ -8,7 +8,7 @@
 from django.contrib import admin, messages
 from django.contrib.sites.models import Site
 from django.db.models import Q, TextField
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import nested_admin
 import pandas as pd

enhydris/forms/auth.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from captcha.fields import CaptchaField
 from registration.forms import RegistrationFormTermsOfService

enhydris/forms/timeseries.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from enhydris import models
 

enhydris/models/timeseries.py

@@ -146,7 +146,10 @@ def get_start_date():
                 return self.timeseriesrecord_set.earliest().timestamp.astimezone(
                     ZoneInfo(self.timeseries_group.gentity.display_timezone)
                 )
-            except TimeseriesRecord.DoesNotExist:
+            except (TimeseriesRecord.DoesNotExist, ValueError):
+                # The ValueError above is for the case where the Timeseries object does
+                # not have a primary key yet (has not been saved), which causes a
+                # problem in Django>=4.
                 return None
 
         return cache.get_or_set(f"timeseries_start_date_{self.id}", get_start_date)
@@ -158,7 +161,10 @@ def get_end_date():
                 return self.timeseriesrecord_set.latest().timestamp.astimezone(
                     ZoneInfo(self.timeseries_group.gentity.display_timezone)
                 )
-            except TimeseriesRecord.DoesNotExist:
+            except (TimeseriesRecord.DoesNotExist, ValueError):
+                # The ValueError above is for the case where the Timeseries object does
+                # not have a primary key yet (has not been saved), which causes a
+                # problem in Django>=4.
                 return None
 
         return cache.get_or_set(f"timeseries_end_date_{self.id}", get_end_date)

enhydris/tasks.py

@@ -4,7 +4,7 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.mail import send_mail
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import celery
 

enhydris/telemetry/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from enhydris.telemetry import TelemetryError
 from enhydris.telemetry.models import Telemetry, timezone_choices

enhydris/telemetry/models.py

@@ -8,7 +8,7 @@
 
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import IntegrityError, models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import iso8601
 

enhydris/telemetry/types/__init__.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class TelemetryAPIClientBase:

enhydris/telemetry/types/addupi.py

@@ -1,7 +1,7 @@
 import datetime as dt
 from io import StringIO
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import requests
 from defusedxml import ElementTree

enhydris/telemetry/types/meteoview2.py

@@ -3,7 +3,7 @@
 from io import StringIO
 from zoneinfo import ZoneInfo
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import requests
 

enhydris/telemetry/views.py

@@ -2,7 +2,7 @@
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic.base import View
 from django.views.generic.detail import DetailView
 from django.views.generic.list import ListView

requirements-dev.txt

@@ -1,5 +1,5 @@
 model-mommy>=1.6.0
-django-cors-headers<4
+django-cors-headers>=4,<5
 sphinx>=4
 django-selenium-clean>=1,<2
 beautifulsoup4>=4.4

requirements.txt

@@ -1,4 +1,4 @@
-Django>=3.2,<4
+Django>=4.2,<5
 djangorestframework>=3.9,<4
 gdal>=1.6
 iso8601
@@ -11,7 +11,7 @@ django-rest-captcha>=0.1.0,<1
 django-parler>=2.2,<3
 django-parler-rest>=2,<3
 django-geowidgets>=0.1.1,<1
-django-nested-admin>=3.2,<4
+django-nested-admin>=4.1,<5
 django-crequest
 celery>=5.2.2,<6
 django-registration-redux>=2.9,<3