Update/dependencies

.github/workflows/run_tests.yml

@@ -33,8 +33,9 @@ jobs:
       - name: Output Coverage
         run: coverage report && coverage xml
       - name: Upload coverage to CodeCov
-        uses: codecov/codecov-action@v3 # https://github.com/codecov/codecov-action
+        uses: codecov/codecov-action@v4 # https://github.com/codecov/codecov-action
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           env_vars: OS,PYTHON
           fail_ci_if_error: true
           files: ./coverage/coverage.xml

README.md

@@ -2,6 +2,12 @@
 
 A re-introduction of the web application for ESRG Knights of the Kitchen Table using Django 3.2.
 
+![Testrun workflow](https://github.com/esrg-knights/Squire/actions/workflows/run_tests.yml/badge.svg)
+[![codecov](https://codecov.io/gh/esrg-knights/Squire/graph/badge.svg?token=BRTHryxW4X)](https://codecov.io/gh/esrg-knights/Squire)
+![Django Version](https://img.shields.io/badge/django%20versions-3.2-blue)
+![Python Version](https://img.shields.io/badge/python-3.8-blue)
+![License](https://img.shields.io/github/license/esrg-knights/Squire)
+
 ## Getting started with development
 
 1. Install the latest version of Python 3. If you are on Windows, you can download Python from [python.org]. If you are not, check if you already have a recent version by running `python3 --version`. As of writing, Python 3.8 or higher is recent enough, but this may change in the future.

activity_calendar/feeds.py

@@ -20,13 +20,6 @@
 import activity_calendar.util as util
 
 
-# Monkey-patch; Why is this not open for extension in the first place?
-feedgenerator.ITEM_EVENT_FIELD_MAP = (
-    *(feedgenerator.ITEM_EVENT_FIELD_MAP),
-    ("recurrenceid", "recurrence-id"),
-)
-
-
 def only_for(class_type, default=None):
     def only_for_decorator(func):
         def func_wrapper(self, item):
@@ -259,7 +252,7 @@ def item_exdate(self, item):
 
     # RECURRENCE-ID
     @only_for(ActivityMoment)
-    def item_recurrenceid(self, item):
+    def item_recurrence_id(self, item):
         if item.is_part_of_recurrence:
             return item.recurrence_id.astimezone(timezone.get_current_timezone())
         return None
@@ -276,9 +269,9 @@ def feed_extra_kwargs(self, obj):
     def item_extra_kwargs(self, item):
         kwargs = super().item_extra_kwargs(item)
 
-        val = self._get_dynamic_attr("item_recurrenceid", item)
+        val = self._get_dynamic_attr("item_recurrence_id", item)
         if val:
-            kwargs["recurrenceid"] = val
+            kwargs["recurrence_id"] = val
         return kwargs
 
 

membership_file/models.py

@@ -1,3 +1,4 @@
+from decimal import Decimal
 from django.conf import settings
 from django.core.validators import RegexValidator, MinValueValidator
 from django.db import models
@@ -113,7 +114,7 @@ class Meta:
 
     # External cards require a deposit, which has changed over the years
     external_card_deposit = models.DecimalField(
-        validators=[MinValueValidator(0)],
+        validators=[MinValueValidator(Decimal(0))],
         max_digits=5,
         decimal_places=2,
         null=True,

requirements/ci.txt

@@ -4,6 +4,5 @@
 
 -r prod.txt
 
-codecov~=2.1.12 # CodeCov Integration
-coverage~=6.4.4 # Code Coverage
-django-test-migrations==1.2.0 # Testing migrations
+coverage~=7.5.3 # Code Coverage
+django-test-migrations~=1.3.0 # Testing migrations

requirements/common.txt

@@ -2,19 +2,19 @@
 # These are libraries that are needed for any environment
 
 # Import the common-dependencies
-Django~=3.2.15
+Django~=3.2.23
 django-bootstrap4~=22.2
-django-cleanup~=6.0.0 # Removes old FileField files upon saving
-djangorestframework~=3.12.4 # TODO: Deprecate
-Pillow~=9.2.0 # ImageField support
-django-ical~=1.8.3 # iCalendar export
+django-cleanup~=8.1.0 # Removes old FileField files upon saving
+djangorestframework~=3.15.1 # TODO: Deprecate
+Pillow~=10.3.0 # ImageField support
+django-ical~=1.9.2 # iCalendar export
 django-recurrence~=1.11.1 # Recurring Dates
-django-import-export~=2.8.0 # Import/Export models
-django-dynamic-preferences~=1.14.0 # Global Preferences / User Preferences
-django-object-actions~=4.1.0 # Dynamic admin panel actions
-martor~=1.6.14, <=1.6.26; # Markdown Editor
-pymdown-extensions~=9.5 # Extra markdown features
-django-pwa~=1.0.10 # Progressive Webapp
-requests~=2.28.1 # Requests (needed for Mailcow API)
+django-import-export~=2.9.0 # Import/Export models
+django-dynamic-preferences~=1.16.0 # Global Preferences / User Preferences
+django-object-actions~=4.2.0 # Dynamic admin panel actions
+martor==1.6.14, <=1.6.26; # Markdown Editor
+pymdown-extensions~=9.11 # Extra markdown features
+django-pwa~=1.1.0 # Progressive Webapp
+requests~=2.32.3 # Requests (needed for Mailcow API)
 django-tempus-dominus~=5.1.2.17 # DateTimePicker
 easywebdav~=1.2.0 # For Nextcloud

requirements/dev.txt

@@ -7,6 +7,6 @@
 # Import the dev-dependencies
 coverage~=6.4.4 # Code Coverage
 django-debug-toolbar~=3.6.0 # Debug Panel
-django-test-migrations==1.2.0 # Testing migrations
+django-test-migrations~=1.3.0 # Testing migrations
 black # Linting
 aiosmtpd # Email debugging

requirements/prod.txt

@@ -5,5 +5,5 @@
 -r common.txt
 
 # Import the prod-dependencies
-gunicorn~=20.1.0
-sentry-sdk~=1.9.8
+gunicorn~=22.0.0
+sentry-sdk~=2.3.1