Merge branch 'release/7.4.0'

uccser · Apr 18, 2024 · 2f98f57 · 2f98f57
2 parents 7dafd64 + ce7cf8e
commit 2f98f57
Show file tree

Hide file tree

Showing 77 changed files with 579 additions and 380 deletions.
diff --git a/.github/workflows/auto-merge-dependency-updates.yaml b/.github/workflows/auto-merge-dependency-updates.yaml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.5
+        uses: dependabot/fetch-metadata@v2.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve

diff --git a/.github/workflows/crowdin-actions.yaml b/.github/workflows/crowdin-actions.yaml
@@ -16,15 +16,15 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Upload or update source files to Crowdin
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: true
 
     - name: Download Chinese (simplified) translations
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: false
         download_translations: true
@@ -42,7 +42,7 @@ jobs:
         config: crowdin.yaml
 
     - name: Download French translations
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: false
         download_translations: true
@@ -60,7 +60,7 @@ jobs:
         config: crowdin.yaml
 
     - name: Download German translations
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: false
         download_translations: true
@@ -78,7 +78,7 @@ jobs:
         config: crowdin.yaml
 
     - name: Download Indonesian translations
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: false
         download_translations: true
@@ -96,7 +96,7 @@ jobs:
         config: crowdin.yaml
 
     - name: Download Italian translations
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: false
         download_translations: true
@@ -114,7 +114,7 @@ jobs:
         config: crowdin.yaml
 
     - name: Download Te Reo Māori translations
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: false
         download_translations: true
@@ -132,7 +132,7 @@ jobs:
         config: crowdin.yaml
 
     - name: Download Turkish translations
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: false
         download_translations: true

diff --git a/.github/workflows/test-and-deploy.yaml b/.github/workflows/test-and-deploy.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create Docker network
         run: docker network create uccser-development-stack
         # Required for the node service
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create Docker network
         run: docker network create uccser-development-stack
         # Required for the node service
@@ -58,7 +58,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run general tests
         run: ./dev ci test_general
       - name: Create coverage file
@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run resource tests
         run: ./dev ci test_resources
       - name: Create coverage file
@@ -90,7 +90,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run management tests
         run: ./dev ci test_management
       - name: Create coverage file
@@ -106,7 +106,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run style tests
         run: ./dev ci style
 
@@ -115,9 +115,9 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4.3.1
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: '3.x'
       - name: Install dependencies
@@ -145,7 +145,7 @@ jobs:
     ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create Docker network
         run: docker network create uccser-development-stack
@@ -167,7 +167,7 @@ jobs:
         run: tar czf static-files.tar.gz --directory csunplugged/staticfiles/ .
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: static-files
           path: static-files.tar.gz
@@ -191,7 +191,7 @@ jobs:
     ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create Docker network
         run: docker network create uccser-development-stack
@@ -219,7 +219,7 @@ jobs:
         run: tar czf resource-thumbnails.tar.gz --directory csunplugged/build/img/resources/ .
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: resource-thumbnails
           path: resource-thumbnails.tar.gz
@@ -250,7 +250,7 @@ jobs:
     ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create Docker network
         run: docker network create uccser-development-stack
@@ -284,7 +284,7 @@ jobs:
         run: tar czf at-a-distance-files.tar.gz --directory csunplugged/build/slides/ .
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: at-a-distance-files-${{ matrix.language }}
           path: at-a-distance-files.tar.gz
@@ -319,7 +319,7 @@ jobs:
     ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create Docker network
         run: docker network create uccser-development-stack
@@ -347,7 +347,7 @@ jobs:
         run: tar czf resources.tar.gz --directory csunplugged/build/resources/ .
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: resources-${{ matrix.language }}
           path: resources.tar.gz
@@ -368,10 +368,10 @@ jobs:
     ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts/
 
@@ -390,23 +390,23 @@ jobs:
           ls artifacts/at-a-distance-files-*/at-a-distance-files.tar.gz | xargs -n1 tar -xz --directory csunplugged/staticfiles/slides --file
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=tag,priority=1
             type=ref,event=branch,priority=2
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v5.3.0
         with:
           file: ./infrastructure/production/django/Dockerfile
           context: .

diff --git a/csunplugged/at_a_distance/models.py b/csunplugged/at_a_distance/models.py
@@ -4,7 +4,7 @@
 from django.urls import reverse
 from django.db import models
 from django.utils.translation import get_language
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from utils.TranslatableModel import TranslatableModel
 from at_a_distance.settings import AT_A_DISTANCE_SLIDES_TEMPLATE_BASE_PATH
 

diff --git a/csunplugged/at_home/models.py b/csunplugged/at_home/models.py
@@ -2,7 +2,7 @@
 
 from django.urls import reverse
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from utils.TranslatableModel import TranslatableModel
 from django.contrib.postgres.search import SearchVectorField
 from django.contrib.postgres.indexes import GinIndex

diff --git a/csunplugged/classic/models.py b/csunplugged/classic/models.py
@@ -1,7 +1,7 @@
 """Models for the classic application."""
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.postgres.search import SearchVectorField
 from django.contrib.postgres.indexes import GinIndex
 

diff --git a/csunplugged/config/__init__.py b/csunplugged/config/__init__.py
@@ -1,3 +1,3 @@
 """Module for Django system configuration."""
 
-__version__ = "7.3.0"
+__version__ = "7.4.0"
diff --git a/csunplugged/config/settings/base.py b/csunplugged/config/settings/base.py
@@ -14,6 +14,10 @@
 import logging.config
 import django.conf.locale
 
+# django-bootstrap-breadcrumbs compatibility: smart_text changed to smart_str.
+from django.utils.encoding import smart_str
+django.utils.encoding.smart_text = smart_str
+
 # cs-unplugged/csunplugged/config/settings/base.py - 3 = csunplugged/
 ROOT_DIR = environ.Path(__file__) - 3
 
@@ -323,5 +327,11 @@
     "http://localhost:8000",
     "https://canterbury.ac.nz"
 ]
+
+CSRF_TRUSTED_ORIGINS = [
+    "https://*.localhost",
+    "https://*.canterbury.ac.nz"
+]
+
 # Used by speaker notes for at a distance slides
 X_FRAME_OPTIONS = "SAMEORIGIN"
diff --git a/csunplugged/general/models.py b/csunplugged/general/models.py
@@ -2,7 +2,7 @@
 
 from django.db import models
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.postgres.search import SearchVectorField
 from django.contrib.postgres.indexes import GinIndex
 from search.utils import get_template_text