Upgrade to Django 5.2 LTS

Author: ihalaij1

.github/workflows/Dockerfile

@@ -1,10 +1,10 @@
-FROM python:3.10-alpine
+FROM python:3.13-trixie
 
 WORKDIR /app
 
-RUN apk update && apk add git
+RUN apt update && apt install -y git gcc musl-dev libffi-dev
 
-RUN adduser --disabled-password prospector prospector \
+RUN adduser --disabled-password prospector \
     && chown -R prospector:prospector /app \
     && rm -rf ${HOME}/.cache/ ${HOME}/.local/bin/__pycache__/
 USER prospector

README.md

@@ -12,8 +12,8 @@ There is a Docker container image available for local testing and development of
 Requirements
 ------------
 
-* Python 3.8+
-* Django 4.2+
+* Python 3.10+
+* Django 5.2+
 * Postgresql 12+
 
 More details of packages in installation documentation.

accounts/urls.py

@@ -1,4 +1,4 @@
-from django.urls import re_path
+from django.urls import path
 from django.contrib.auth import views as auth_views
 
 import django_lti_login.views
@@ -7,7 +7,7 @@
 urlpatterns = [
     # Only some of the auth.urls are currently enable
     #re_path('^', include('django.contrib.auth.urls')),
-    re_path(r'^login/$', auth_views.LoginView.as_view(), name='login'),
-    re_path(r'^logout/$', auth_views.LogoutView.as_view(), name='logout'),
-    re_path(r'^lti_login$', django_lti_login.views.lti_login, name='lti_login'),
+    path('login/', auth_views.LoginView.as_view(), name='login'),
+    path('logout/', auth_views.LogoutView.as_view(), name='logout'),
+    path('lti_login', django_lti_login.views.lti_login, name='lti_login'),
 ]

core/urls.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.urls import re_path
+from django.urls import path
 from django.views.decorators.cache import cache_page
 from django.views.generic import TemplateView
 
@@ -14,16 +14,16 @@ def cache(time=60 * 15):
 
 app_name = CoreConfig.name
 urlpatterns = [
-    re_path(r'^$',
+    path('',
         TemplateView.as_view(template_name="core/frontpage.html"),
         name='fronpage'),
-    re_path(r'^manage/servicestatus/$',
+    path('manage/servicestatus/',
         views.ServiceStatusPage.as_view(),
         name='servicestatus'),
-    re_path(r'^manage/servicestatus/data/$',
+    path('manage/servicestatus/data/',
         cache(10)(views.ServiceStatusData.as_view()),
         name='servicestatus-data'),
-    re_path(r'^manage/clear-cache/$',
+    path('manage/clear-cache/',
         views.ClearCache.as_view(),
         name='clear-cache'),
 ]

feedback/admin.py

@@ -11,20 +11,17 @@
 )
 
 
+@admin.register(Course, Exercise, Feedback, Student)
 class CachedAdmin(admin.ModelAdmin):
     def has_add_permission(self, request, obj=None): # pylint: disable=unused-argument
         return False
 
 
+@admin.register(FeedbackTag)
 class FeedbackTagAdmin(ColorTagAdmin):
     fields = ColorTagAdmin.fields + (
         'course',
     )
 
 
-admin.site.register(Student, CachedAdmin)
-admin.site.register(Course, CachedAdmin)
-admin.site.register(Exercise, CachedAdmin)
-admin.site.register(Feedback, CachedAdmin)
-admin.site.register(FeedbackTag, FeedbackTagAdmin)
 admin.site.register(ContextTag, admin.ModelAdmin)

feedback/urls.py

@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.urls import path
 from django.urls import re_path
 from django.views.decorators.cache import cache_page
 from .apps import FeedbackConfig
@@ -26,89 +27,89 @@
 app_name = FeedbackConfig.name
 urlpatterns = [
     # Aplus feedback submission
-    re_path(r'^feedback/$',
+    path('feedback/',
         FeedbackSubmissionView_view,
         name='submission'),
     re_path(r'^feedback/(?P<path_key>{path_regex}+)$'.format(path_regex=PATH_REGEX),
         FeedbackSubmissionView_view,
         name='submission'),
 
     # Feedback management and responding
-    re_path(r'^manage/$',
+    path('manage/',
         views.ManageSiteListView.as_view(),
         name='site-list'),
-    re_path(r'^manage/courses/$',
+    path('manage/courses/',
         ManageCourseListView_view,
         name='course-list'),
-    re_path(r'^manage/courses/(?P<site_id>\d+)/$',
+    path('manage/courses/<int:site_id>/',
         ManageCourseListView_view,
         name='course-list'),
-    re_path(r'^manage/(?P<course_id>\d+)/update-studenttags/$',
+    path('manage/<int:course_id>/update-studenttags/',
         views.ManageUpdateStudenttagsView.as_view(),
         name='update-studenttags'),
-    re_path(r'^manage/(?P<course_id>\d+)/unread/$',
+    path('manage/<int:course_id>/unread/',
         ManageNotRespondedListView_view,
         name='notresponded-course'),
     re_path(r'^manage/(?P<course_id>\d+)/unread/(?P<path_filter>{path_regex}*)$'.format(path_regex=PATH_REGEX),
         ManageNotRespondedListView_view,
         name='notresponded-course'),
-    re_path(r'^manage/(?P<course_id>\d+)/feedbacks/$',
+    path('manage/<int:course_id>/feedbacks/',
         views.ManageFeedbacksListView.as_view(),
         name='list'),
-    re_path(r'^manage/(?P<course_id>\d+)/background/(?P<student_id>\d+)/$',
+    path('manage/<int:course_id>/background/<int:student_id>/',
         views.StudentBackgroundView.as_view(),
         name='background'),
-    re_path(r'^manage/points/(?P<conversation_id>\d+)/$',
+    path('manage/points/<int:conversation_id>/',
         views.FeedbackPointsView.as_view(),
         name='points'),
-    re_path(r'^manage/(?P<course_id>\d+)/user/$',
+    path('manage/<int:course_id>/user/',
         UserListView_view,
         name='user-list'),
-    re_path(r'^manage/(?P<course_id>\d+)/byuser/(?P<user_id>\d+)/$',
+    path('manage/<int:course_id>/byuser/<int:user_id>/',
         UserFeedbackListView_view,
         name='byuser'),
-    re_path(r'^manage/(?P<course_id>\d+)/tags/$',
+    path('manage/<int:course_id>/tags/',
         views.FeedbackTagListView.as_view(),
         name='tags'),
-    re_path(r'^manage/(?P<course_id>\d+)/tags/(?P<tag_id>\d+)/$',
+    path('manage/<int:course_id>/tags/<int:tag_id>/',
         views.FeedbackTagEditView.as_view(),
         name='tags-edit'),
-    re_path(r'^manage/(?P<course_id>\d+)/tags/(?P<tag_id>\d+)/remove/$',
+    path('manage/<int:course_id>/tags/<int:tag_id>/remove/',
         views.FeedbackTagDeleteView.as_view(),
         name='tags-remove'),
-    re_path(r'^manage/(?P<course_id>\d+)/tags/import/$',
+    path('manage/<int:course_id>/tags/import/',
         views.ImportTagsView.as_view(),
         name='tags-import'),
-    re_path(r'^manage/(?P<course_id>\d+)/contexttags/$',
+    path('manage/<int:course_id>/contexttags/',
         views.ContextTagListView.as_view(),
         name='contexttags'),
-    re_path(r'^manage/(?P<course_id>\d+)/contexttags/(?P<tag_id>\d+)/$',
+    path('manage/<int:course_id>/contexttags/<int:tag_id>/',
         views.ContextTagEditView.as_view(),
         name='contexttags-edit'),
-    re_path(r'^manage/(?P<course_id>\d+)/contexttags/(?P<tag_id>\d+)/remove/$',
+    path('manage/<int:course_id>/contexttags/<int:tag_id>/remove/',
         views.ContextTagDeleteView.as_view(),
         name='contexttags-remove'),
-    re_path(r'^manage/respond/(?P<feedback_id>\d+)/$',
+    path('manage/respond/<int:feedback_id>/',
         RespondFeedbackView_view,
         name='respond'),
-    re_path(r'^manage/status/(?P<feedback_id>\d+)/$',
+    path('manage/status/<int:feedback_id>/',
         views.ResponseStatusView.as_view(),
         name='status'),
-    re_path(r'^manage/tag/(?P<conversation_id>\d+)/$',
+    path('manage/tag/<int:conversation_id>/',
         views.FeedbackTagView.as_view(),
         name='tag-list'),
-    re_path(r'^manage/tag/(?P<conversation_id>\d+)/(?P<tag_id>\d+)/$',
+    path('manage/tag/<int:conversation_id>/<int:tag_id>/',
         views.FeedbackTagView.as_view(),
         name='tag'),
 
     # support for old urls
-    re_path(r'^manage/notresponded/course/(?P<course_id>\d+)/$',
+    path('manage/notresponded/course/<int:course_id>/',
          ManageNotRespondedListView_view),
     re_path(r'^manage/notresponded/course/(?P<course_id>\d+)/(?P<path_filter>{path_regex}*)$'
     .format(path_regex=PATH_REGEX),
          ManageNotRespondedListView_view),
-    re_path(r'^manage/user/(?P<course_id>\d+)/$',
+    path('manage/user/<int:course_id>/',
         UserListView_view),
-    re_path(r'^manage/byuser/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
+    path('manage/byuser/<int:course_id>/<int:user_id>/',
         UserFeedbackListView_view),
 ]

jutut/urls.py

@@ -9,12 +9,12 @@
 
 
 urlpatterns = [
-    re_path(r'^', include(feedback.urls)),
-    re_path(r'^timeusage/', include(timeusage.urls)),
-    re_path(r'^', include(core.urls)),
-    re_path(r'^i18n/', include('django.conf.urls.i18n')),
+    path('', include(feedback.urls)),
+    path('timeusage/', include(timeusage.urls)),
+    path('', include(core.urls)),
+    path('i18n/', include('django.conf.urls.i18n')),
     re_path(r'^admin/', admin.site.urls),
-    re_path(r'^accounts/', include(accounts.urls)),
+    path('accounts/', include(accounts.urls)),
 ]
 
 if settings.ENABLE_DJANGO_DEBUG_TOOLBAR:

requirements.txt

@@ -1,14 +1,14 @@
 # Usage: pip install -r requirements.txt
-Django ~= 4.2.1
+Django ~= 5.2.13
 Jinja2 ~= 3.1.1
 django-jinja ~= 2.10.0
 django-jinja-bootstrap-form ~= 4.5.0
 django-bootstrap5 >= 24.2
-git+https://github.com/apluslms/django-essentials.git@1.6.0#egg=django-essentials~=1.6.0
-git+https://github.com/apluslms/js-jquery-toggle.git@2.0.0#egg=js-jquery-toggle-django~=2.0.0&subdirectory=django
-git+https://github.com/apluslms/django-dictiterators.git@1.1.1#egg=django-dictiterators~=1.1.1
-git+https://github.com/apluslms/django-colortag.git@3.0.0#egg=django-colortag~=3.0.0
-git+https://github.com/apluslms/django-lti-login.git@3.3.0#egg=django-lti-login~=3.3.0
+git+https://github.com/apluslms/django-essentials.git@1.7.0#egg=django-essentials
+git+https://github.com/apluslms/js-jquery-toggle.git@2.0.0#egg=js-jquery-toggle-django&subdirectory=django
+git+https://github.com/apluslms/django-dictiterators.git@1.1.2#egg=django-dictiterators
+git+https://github.com/apluslms/django-colortag.git@3.1.0#egg=django-colortag
+git+https://github.com/apluslms/django-lti-login.git@3.4.0#egg=django-lti-login
 django-filter ~= 22.1
 django-settingsdict ~= 1.1.1
 celery ~= 5.3.1

timeusage/urls.py

@@ -1,10 +1,10 @@
-from django.urls import re_path
+from django.urls import path
 from . import views
 from .apps import TimeUsageConfig
 
 app_name = TimeUsageConfig.name
 urlpatterns = [
-    re_path(r'^(?P<course_id>\d+)/$',
+    path('<int:course_id>/',
     views.TimeUsageView.as_view(),
     name='time-usage')
 ]