Merge pull request #123 from PiotrIw/fix_issues

v1.5.56 - upgrade django to 5.2

Author: PiotrIw

.contrib/docker/Dockerfile.web

@@ -23,7 +23,7 @@ RUN pip install --upgrade pip
 RUN pip --version
 COPY requirements/*.txt ./requirements/
 # left for github actions reference:
-ARG DJANGO_VERSION='==3.2.23'
+ARG DJANGO_VERSION='==5.2'
 RUN pip install --no-cache-dir -r requirements/dev.txt
 # CMD ["bash", "-c", "python manage.py collectstatic --no-input && python manage.py migrate && python manage.py runserver 0.0.0.0:8000"]
 # to allow VScode run and debug django app:

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
       rev: 1.29.1
       hooks:
           - id: django-upgrade
-            args: [--target-version, "4.2"]
+            args: [--target-version, "5.2"]
     - repo: https://github.com/asottile/pyupgrade
       rev: v3.21.2
       hooks:

feder/__init__.py

@@ -1,5 +1,5 @@
 # PEP 396: The __version__ attribute's value SHOULD be a string.
-__version__ = "1.5.55.deps"
+__version__ = "1.5.56"
 
 
 # Compatibility to eg. django-rest-framework

feder/letters/locale/pl/LC_MESSAGES/django.mo

@@ -12,6 +12,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddConstraint(
             model_name='letter',
-            constraint=models.CheckConstraint(check=models.Q(models.Q(('author_institution__isnull', True), ('author_user__isnull', False)), models.Q(('author_institution__isnull', False), ('author_user__isnull', True)), models.Q(('author_institution__isnull', True), ('author_user__isnull', True)), _connector='OR'), name='only_one_or_none_author'),
+            constraint=models.CheckConstraint(condition=models.Q(models.Q(('author_institution__isnull', True), ('author_user__isnull', False)), models.Q(('author_institution__isnull', False), ('author_user__isnull', True)), models.Q(('author_institution__isnull', True), ('author_user__isnull', True)), _connector='OR'), name='only_one_or_none_author'),
         ),
     ]

feder/letters/migrations/0043_letter_only_one_or_none_author.py

@@ -222,7 +222,7 @@ class Meta:
         )
         constraints = [
             models.CheckConstraint(
-                check=(
+                condition=(
                     models.Q(author_user__isnull=False, author_institution__isnull=True)
                     | models.Q(
                         author_user__isnull=True, author_institution__isnull=False

feder/letters/models.py

@@ -28,7 +28,7 @@
 from django.http import HttpResponseBadRequest, JsonResponse
 from django.shortcuts import get_object_or_404
 from django.urls import reverse_lazy
-from django.utils.datetime_safe import datetime
+from django.utils import timezone
 from django.utils.encoding import force_str
 from django.utils.feedgenerator import Atom1Feed
 from django.utils.translation import gettext_lazy as _
@@ -540,8 +540,8 @@ def action(self):
         else:
             self.object.is_spam = Letter.SPAM.spam
         self.object.mark_spam_by = self.request.user
-        self.object.mark_spam_at = datetime.now()
-        self.object.save(update_fields=["is_spam", "mark_spam_by"])
+        self.object.mark_spam_at = timezone.now()
+        self.object.save(update_fields=["is_spam", "mark_spam_by", "mark_spam_at"])
         Alert.objects.link_object(self.object).update(
             solver=self.request.user, status=True
         )

feder/letters/views.py

@@ -87,15 +87,15 @@ msgstr "Kujawsko-pomorskie"
 
 #: feder/teryt/templates/teryt/_voivodeship_map.svg.html:92
 msgid "Podlaskie"
-msgstr "Pomorskie"
+msgstr "Podlaskie"
 
 #: feder/teryt/templates/teryt/_voivodeship_map.svg.html:98
 msgid "West Pomeranian"
 msgstr "Zachodniopomorskie"
 
 #: feder/teryt/templates/teryt/_voivodeship_map.svg.html:104
 msgid "Warmian-Masurian"
-msgstr "Warmińskomazurskie"
+msgstr "Warmińsko-mazurskie"
 
 #: feder/teryt/templates/teryt/_voivodeship_map.svg.html:110
 msgid "Pomeranian"