Updated django and picklefield

Author: bveldkamp

Pipfile

@@ -20,9 +20,9 @@ django-nose = "==1.4.7"
 nose = "==1.3.7"
 django-recaptcha = "==3.0.0"
 django-constance = {version = "==2.9.1", extras = ["database"]}
-django-picklefield = "==2.1.1"
+django-picklefield = "==3.2.0"
 psycopg2-binary = "==2.8.6"
-Django = "==3.2.25"
+Django = "==4.2.16"
 gunicorn = "22.0.0"
 python-dateutil = "2.8.2"
 

Pipfile.lock

@@ -12,7 +12,7 @@
 from django.db import models
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django_extensions.db.models import TimeStampedModel
 from mailing.helpers import get_template_by_id, mail_user, render_mail_template
 

webapp/accounts/models.py

@@ -1,39 +1,39 @@
-from django.conf.urls import url
+from django.urls import path
 from accounts import views
 
 urlpatterns = (
-    url(r'^login/$', views.LoginView.as_view(), name="login"),
-    url(r'^logout/$', views.LogoutView.as_view(), name="logout"),
+    path('login/', views.LoginView.as_view(), name="login"),
+    path('logout/', views.LogoutView.as_view(), name="logout"),
 
-    url(r'^register/$', views.RegisterView.as_view(), name="register"),
-    url(r'^register/thanks/$',
-        views.RegisterThanksView.as_view(),
-        name="register_thanks"),
-    url(r'^register/confirm/(?P<pk>[0-9a-zA-Z\-]+)$',
-        views.EmailConfirmView.as_view(),
-        name="confirm_email"),
-    url(r'^register/finish/(?P<pk>[0-9a-zA-Z\-]+)$',
-        views.FinishRegistration.as_view(),
-        name="finish_registration"),
+    path('register/', views.RegisterView.as_view(), name="register"),
+    path('register/thanks/',
+         views.RegisterThanksView.as_view(),
+         name="register_thanks"),
+    path('register/confirm/<pk>/',
+         views.EmailConfirmView.as_view(),
+         name="confirm_email"),
+    path('register/finish/<pk>/',
+         views.FinishRegistration.as_view(),
+         name="finish_registration"),
 
-    url(r'^passwordreset/$',
-        views.RequestPasswordResetView.as_view(),
-        name="password_reset"),
-    url(r'^passwordreset/done/$',
-        views.PasswordResetRequestDoneView.as_view()),
-    url(r'^passwordreset/finished/$',
-        views.PasswordResetFinishedView.as_view()),
-    url(r'^passwordreset/reset/(?P<pk>[0-9a-zA-Z\-]+)$',
-        views.PasswordResetView.as_view(),
-        name="reset_pass"),
+    path('passwordreset/',
+         views.RequestPasswordResetView.as_view(),
+         name="password_reset"),
+    path('passwordreset/done/',
+         views.PasswordResetRequestDoneView.as_view()),
+    path('passwordreset/finished/',
+         views.PasswordResetFinishedView.as_view()),
+    path('passwordreset/reset/<pk>/',
+         views.PasswordResetView.as_view(),
+         name="reset_pass"),
 
-    url(r'^welcome/$', views.WelcomeView.as_view()),
-    url(r'^overview/$', views.OverView.as_view(), name='overview'),
-    url(r'^profile/$', views.ProfileView.as_view(), name='profile'),
-    url(r'^updateProfile/$', views.EditProfileView.as_view(), name='update_profile'),
-    url(r'^contact/$', views.Contact.as_view(), name='contact'),
-    url(r'^orderHistory/$', views.OrderHistory.as_view(), name='order_history'),
+    path('welcome/', views.WelcomeView.as_view()),
+    path('overview/', views.OverView.as_view(), name='overview'),
+    path('profile/', views.ProfileView.as_view(), name='profile'),
+    path('updateProfile/', views.EditProfileView.as_view(), name='update_profile'),
+    path('contact/', views.Contact.as_view(), name='contact'),
+    path('orderHistory/', views.OrderHistory.as_view(), name='order_history'),
 
-    url(r'^profile/remarks/(?P<pk>[0-9a-zA-Z\-]+)$', views.EditCoordinatorRemarksView.as_view(),
-        name='coordinator_remarks')
+    path('profile/remarks/<pk>', views.EditCoordinatorRemarksView.as_view(),
+         name='coordinator_remarks')
 )

webapp/accounts/urls.py

@@ -1,10 +1,10 @@
-from django.conf.urls import url
+from django.urls import path, re_path
 from api import views
 
 urlpatterns = (
-    url(r'^orders(.json)?$', views.OrdersJSONView.as_view()),
-    url(r'^orders.csv$', views.OrdersCSVView.as_view()),
+    re_path(r'^orders(.json)?$', views.OrdersJSONView.as_view()),
+    path('orders.csv', views.OrdersCSVView.as_view()),
 
-    url(r'^accounts(.json)?$', views.AccountsJSONView.as_view()),
-    url(r'^accounts.csv$', views.AccountsCSVView.as_view()),
+    re_path(r'^accounts(.json)?$', views.AccountsJSONView.as_view()),
+    path('accounts.csv', views.AccountsCSVView.as_view()),
 )

webapp/api/urls.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from distribution.models import Shift
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 import datetime
 from accounts.models import VokoUser
 from constance import config

webapp/distribution/admin.py

@@ -1,10 +1,10 @@
-from django.conf.urls import url
+from django.urls import path
 from .views import Schedule, Shift
 from distribution.views import Members, Groupmanager
 
 urlpatterns = (
-    url(r'^schedule/$', Schedule.as_view(), name="distribution_schedule"),
-    url(r'^shift/(?P<slug>[-\w]+)/$', Shift.as_view(), name="shift"),
-    url(r'^members/$', Members.as_view(), name="distribution_members"),
-    url(r'^groupmanager/$', Groupmanager.as_view(), name="distribution_groupmanager")
+    path('schedule/', Schedule.as_view(), name="distribution_schedule"),
+    path('shift/<slug>/', Shift.as_view(), name="shift"),
+    path('members/', Members.as_view(), name="distribution_members"),
+    path('groupmanager/', Groupmanager.as_view(), name="distribution_groupmanager")
 )

webapp/distribution/urls.py

@@ -1,10 +1,10 @@
-from django.conf.urls import url
+from django.urls import path
 from .views import DocumentOverview, DocumentDownload
 
 urlpatterns = (
-    url(r'^download/(?P<slug>[a-z0-9\-]+)/$',
-        DocumentDownload.as_view(),
-        name="docs.document_download"),
-    url(r'^', DocumentOverview.as_view(),
-        name="docs.document_overview"),
+    path('download/<slug>/',
+         DocumentDownload.as_view(),
+         name="docs.document_download"),
+    path('', DocumentOverview.as_view(),
+         name="docs.document_overview"),
 )

webapp/docs/urls.py

@@ -1,36 +1,36 @@
-from django.conf.urls import url
+from django.urls import path
 from django.views.generic import RedirectView
 from finance import views, admin_views
 
 urlpatterns = (
-    url(r'^pay/choosebank/$',
-        views.ChooseBankView.as_view(),
-        name="finance.choosebank"),
-    url(r'^pay/cancel/$',
-        views.CancelPaymentView.as_view(),
-        name="finance.cancelpayment"),
-    url(r'^pay/transaction/create/$',
-        views.CreateTransactionView.as_view(),
-        name="finance.createtransaction"),
-    url(r'^pay/transaction/confirm/$',
-        views.ConfirmTransactionView.as_view(),
-        name="finance.confirmtransaction"),
-    url(r'^pay/transaction/callback/$',
-        views.PaymentWebHook.as_view(),
-        name="finance.callback"),
+    path('pay/choosebank/',
+         views.ChooseBankView.as_view(),
+         name="finance.choosebank"),
+    path('pay/cancel/',
+         views.CancelPaymentView.as_view(),
+         name="finance.cancelpayment"),
+    path('pay/transaction/create/',
+         views.CreateTransactionView.as_view(),
+         name="finance.createtransaction"),
+    path('pay/transaction/confirm/',
+         views.ConfirmTransactionView.as_view(),
+         name="finance.confirmtransaction"),
+    path('pay/transaction/callback/',
+         views.PaymentWebHook.as_view(),
+         name="finance.callback"),
 
 
     # Admin views
-    url(r'^admin/(?P<year>[0-9]+)/specified/$',
-        RedirectView.as_view(pattern_name='finance.admin.year.overview',
-                             permanent=True)),
-    url(r'^admin/json/round/(?P<round_id>[0-9]+)/$',
-        admin_views.JsonRoundOverview.as_view(),
-        name="finance.admin.round.overview.json"),
-    url(r'^admin/round/(?P<round_id>[0-9]+)/$',
-        admin_views.RoundOverview.as_view(),
-        name="finance.admin.round.overview"),
-    url(r'^admin/year/(?P<year>[0-9]+)/$',
-        admin_views.YearOverview.as_view(),
-        name="finance.admin.year.overview"),
+    path('admin/<year>/specified/',
+         RedirectView.as_view(pattern_name='finance.admin.year.overview',
+                              permanent=True)),
+    path('admin/json/round/<round_id>/',
+         admin_views.JsonRoundOverview.as_view(),
+         name="finance.admin.round.overview.json"),
+    path('admin/round/<round_id>/',
+         admin_views.RoundOverview.as_view(),
+         name="finance.admin.round.overview"),
+    path('admin/year/<year>/',
+         admin_views.YearOverview.as_view(),
+         name="finance.admin.year.overview"),
 )

webapp/finance/urls.py

@@ -1,6 +1,6 @@
-from django.conf.urls import url
+from django.urls import path
 from .views import Members
 
 urlpatterns = (
-    url(r'^members/$', Members.as_view(), name="groups_members"),
+    path('members/', Members.as_view(), name="groups_members"),
 )