Merge branch 'release/0.22.0'

.github/workflows/auto-merge-dependency-updates.yaml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.0.0
+        uses: dependabot/fetch-metadata@v2.1.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 0.22.0
+
+- Show DTTA news on navbar and homepage
+- Github Action dependency updates:
+    - Update dependabot/fetch-metadata from 2.0.0 to 2.1.0
+- JS dependency updates:
+    - Update cssnano from 5.1.15 to 7.0.1
+    - Update dayjs from 1.11.10 to 1.11.11
+    - Update sass from 1.75.0 to 1.76.0
+- Python dependency updates:
+    - Update django-allauth from 0.62.0 to 0.62.1
+    - Update django-ipware from 4.0.2 to 7.0.1
+    - Update django-model-utils from 4.5.0 to 4.5.1
+    - Update WeasyPrint from 52.4 to 62.0
+    - Update google-api-python-client from 2.126.0 to 2.127.0
+    - Update django-debug-toolbar from 3.8.1 to 4.3.0
+    - Update coverage from 6.5.0 to 7.5.0
+    - Update flake8 from 3.9.2 to 7.0.0
+
 ## 0.21.0
 
 - Fix node UID issue when developing locally
@@ -19,7 +38,7 @@
 - Python dependency updates:
     - Update django from 3.2.16 to 3.2.25
     - Update django-allauth from 0.51.0 to 0.62.0
-    - Update jango-autoslug from 1.9.8  to 1.9.9
+    - Update django-autoslug from 1.9.8  to 1.9.9
     - Update django-ckeditor from 6.5.1 to 6.7.1
     - Update django-cors-headers from 3.13.0 to 3.14.0
     - Update django-environ from 0.9.0 to 0.11.2

dthm4kaiako/config/__init__.py

@@ -1,6 +1,6 @@
 """Configuration for Django system."""
 
-__version__ = "0.21.0"
+__version__ = "0.22.0"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

dthm4kaiako/package.json

@@ -9,8 +9,8 @@
         "bootstrap": "4.6.0",
         "browserify": "17.0.0",
         "child_process": "1.0.2",
-        "cssnano": "5.1.15",
-        "dayjs": "1.11.10",
+        "cssnano": "7.0.1",
+        "dayjs": "1.11.11",
         "details-element-polyfill": "2.4.0",
         "fancy-log": "1.3.3",
         "fuse.js": "6.6.2",
@@ -30,7 +30,7 @@
         "popper.js": "1.16.1",
         "postcss": "8.4.38",
         "postcss-flexbugs-fixes": "5.0.2",
-        "sass": "1.75.0",
+        "sass": "1.76.0",
         "vinyl-buffer": "1.0.1",
         "yargs": "17.7.2"
     },

dthm4kaiako/templates/dtta/base.html

@@ -22,10 +22,9 @@
             <li class="nav-item">
               <a class="nav-link" href="{% url 'dtta:membership' %}">Membership</a>
             </li>
-            <!--  Uncomment to show news.
               <li class="nav-item">
               <a class="nav-link" href="{% url 'dtta:news_article_list' %}">News</a>
-            </li> -->
+            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="dttaCurriculumLinks" role="button" data-toggle="dropdown"
                 aria-haspopup="true" aria-expanded="false">

dthm4kaiako/templates/dtta/home.html

@@ -23,8 +23,7 @@
                 Read about joining DTTA
             </a>
         </div>
-        <!-- Uncomment to show news.
-            <div class="col-12 col-md-6 my-4">
+        <div class="col-12 col-md-6 my-4">
             <h3>Latest news</h3>
             {% for news_article in latest_news_articles %}
                 <div class="row mb-2 no-gutters">
@@ -39,7 +38,7 @@ <h3>Latest news</h3>
                 </div>
             {% endfor %}
             <a href="{% url 'dtta:news_article_list' %}" class="btn btn-dtta-primary my-3">View all news articles</a>
-        </div> -->
+        </div>
         <div class="col-12 col-md-6 my-4">
             <h3>Links</h3>
             <ul>

infrastructure/local/django/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.9-slim-buster as python
+FROM python:3.9.19-bookworm as python
 
 # Python build stage ----------------------------------------------------------
 FROM python as python-build-stage

requirements/base.txt

@@ -1,7 +1,7 @@
 # Django
 django==3.2.25
 django-activeurl==0.2.0  # https://github.com/hellysmile/django-activeurl
-django-allauth==0.62.0
+django-allauth==0.62.1
 django-anymail[mailgun]==8.6
 django-autoslug==1.9.9  # https://github.com/justinmayer/django-autoslug
 django-ckeditor==6.7.1 # Todo: Unused, remove.
@@ -11,10 +11,10 @@ django-environ==0.11.2
 django-filebrowser-no-grappelli==4.0.2
 django-filter==21.1  # https://github.com/carltongibson/django-filter/
 django-inline-svg==0.1.1
-django-ipware==4.0.2
+django-ipware==7.0.1
 django-markdownx==3.0.1  # https://github.com/neutronX/django-markdownx
 django-map-widgets==0.4.2  # https://github.com/erdem/django-map-widgets
-django-model-utils==4.5.0  # https://github.com/jazzband/django-model-utils
+django-model-utils==4.5.1  # https://github.com/jazzband/django-model-utils
 django-modelclone==0.7.1
 django-recaptcha==3.0.0
 django-tinymce==4.0.0 # https://github.com/jazzband/django-tinymce
@@ -32,12 +32,12 @@ python-slugify==4.0.1
 argon2-cffi==21.3.0
 
 # Resources
-WeasyPrint==52.4
+WeasyPrint==62.0
 Pillow==10.3.0
 filetype==1.2.0  # https://github.com/h2non/filetype.py
 
 # Google Cloud Platform
-google-api-python-client==2.126.0
+google-api-python-client==2.127.0
 
 # Sample data generation
 # ----------------------

requirements/local.txt

@@ -2,5 +2,5 @@
 -r base.txt
 -r test.txt
 
-django-debug-toolbar==3.8.1
+django-debug-toolbar==4.3.0
 django-extensions==3.2.3

requirements/test.txt

@@ -1,8 +1,8 @@
 # Test dependencies
 
-coverage==6.5.0
+coverage==7.5.0
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 django-test-without-migrations==0.6
 
-flake8==3.9.2
+flake8==7.0.0
 pydocstyle==6.3.0