Merge pull request watchdogpolska#2367 from watchdogpolska/develop

v1.5.56 - upgrade django to 5.2

Author: PiotrIw

.contrib/docker/Dockerfile.gulp

@@ -1,5 +1,5 @@
 FROM node:24
 WORKDIR /app
 VOLUME /app
-CMD ["bash","-c", "npm install && npx update-browserslist-db@latest && npx gulp build"]
+CMD ["bash","-c", "npm install && npx gulp build"]
 # CMD ["bash","-c", " npm install ; npx gulp build ; sleep infinity "]

.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:

.github/workflows/frontend.yml

@@ -13,7 +13,7 @@ jobs:
   regenerate_frontend:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Collect statics
         run: docker compose run web python manage.py collectstatic --noinput
       - name: Build and run frontend

.github/workflows/web.yml

@@ -19,7 +19,7 @@ jobs:
 # #          - "==2.2.*"
 #           - "==4.2"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           lfs: true
       - name: Build application

.github/workflows/web_image_buil_and_push.yml

@@ -12,7 +12,7 @@ jobs:
     if: github.event.pull_request.merged == true && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get version from script
         id: get_version

.pre-commit-config.yaml

@@ -20,9 +20,9 @@ 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.1
+      rev: v3.21.2
       hooks:
           - id: pyupgrade
             args:
@@ -39,7 +39,7 @@ repos:
                 - --skip-glob
                 - "**/migrations/*.py"
     - repo: https://github.com/sirosen/check-jsonschema
-      rev: 0.34.1
+      rev: 0.36.0
       hooks:
           - id: check-github-workflows
           - id: check-readthedocs
@@ -50,7 +50,7 @@ repos:
             args: [-c, .yamllint.yml]
       #        exclude: (feder/letters/logs/cassettes/.*|docker-compose.yml)
     - repo: https://github.com/psf/black-pre-commit-mirror
-      rev: 25.11.0
+      rev: 25.12.0
       hooks:
           - id: black
             args:

feder/__init__.py

@@ -1,5 +1,5 @@
 # PEP 396: The __version__ attribute's value SHOULD be a string.
-__version__ = "1.5.54"
+__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