django: Upgrade to 5.1

The new changes in Django 3.2->5.1 are pretty trivial (and I read
through (most of?) those release notes), but apparently Django 3.2 had
some deprecated bits (ifequal[1], url[2]) that weren't reported as such
by the Django checks, and I didn't think about them when reading the
"Features removed in 4.0" section[3] (or perhaps entirely skipped 4.0?).

[1] https://docs.djangoproject.com/en/3.2/ref/templates/builtins/#ifequal-and-ifnotequal
[2] https://docs.djangoproject.com/en/3.2/ref/urls/#url
[3] https://docs.djangoproject.com/en/5.1/releases/4.0/#features-removed-in-4-0

setup.py

@@ -6,12 +6,11 @@
     packages = ["squaresdb"],
     install_requires = [
         # Server
-        "django<4",
+        "django~=5.1",
         "django-reversion",
         "pytz", # timezone support TODO: confirm works
         "social-auth-core[saml]>=3.0",
         "social-auth-app-django",
-        #"django-bootstrap-static>=4,<5"
         "django-bootstrap-static>=5,<6"
     ],
 

squaresdb/membership/urls.py

@@ -1,17 +1,16 @@
-from django.conf.urls import url
 from django.urls import path
 
 from squaresdb.membership import views
 
 membership_patterns = [ # pylint:disable=invalid-name
-    url(r'^person/(\d+)/$', views.view_person, name='person'),
-    url(r'^person/edit/$', views.edit_user_person, name='person-user-edit'),
-    url(r'^person/edit/(\d+)/$', views.edit_user_person, name='person-user-edit-id'),
-    url(r'^person/link/([A-Za-z0-9]+)/$', views.edit_person_personauthlink, name='person-link'),
-    url(r'^link/bulk_create/', views.create_personauthlinks, name='personauthlink-bulkcreate'),
-    url(r'^class/$', views.ClassList.as_view(), name='class-list'),
+    path('person/<int:pk>/', views.view_person, name='person'),
+    path('person/edit/', views.edit_user_person, name='person-user-edit'),
+    path('person/edit/<int:pk>/', views.edit_user_person, name='person-user-edit-id'),
+    path('person/link/<slug:secret>/', views.edit_person_personauthlink, name='person-link'),
+    path('link/bulk_create/', views.create_personauthlinks, name='personauthlink-bulkcreate'),
+    path('class/', views.ClassList.as_view(), name='class-list'),
     path(r'class/<int:pk>/', views.ClassDetail.as_view(), name='class-detail'),
-    url(r'^class/import/$', views.import_class, name='class-import'),
+    path('class/import/', views.import_class, name='class-import'),
 ]
 
 def urls():

squaresdb/templates/base.html

@@ -56,24 +56,24 @@
       <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="nav nav-pills">
           <li class="nav-brand">
-              <a class="nav-link{% ifequal pagename "homepage"%} active{%endifequal%}" href="{% url "homepage" %}"><img src='{%static "style/ts-square-logo.png" %}' height='28px' alt='Squares'> DB</a>
+              <a class="nav-link{% if pagename == "homepage"%} active{%endif%}" href="{% url "homepage" %}"><img src='{%static "style/ts-square-logo.png" %}' height='28px' alt='Squares'> DB</a>
           </li>
           <li class="nav-item">
-            <a class="nav-link {% ifequal pagename "person-edit"%}active{%else%}{%if user.is_anonymous%}disabled{%endif%}{%endifequal%}" href="{%url "membership:person-user-edit"%}">Edit entry</a>
+            <a class="nav-link {% if pagename == "person-edit"%}active{%else%}{%if user.is_anonymous%}disabled{%endif%}{%endif%}" href="{%url "membership:person-user-edit"%}">Edit entry</a>
           </li>
         {% if perms.membership.bulk_create_personauthlink %}
           <li class="nav-item">
-            <a class="nav-link{% ifequal pagename "personauthlink-bulkcreate"%} active{%endifequal%}" href='{% url "membership:personauthlink-bulkcreate" %}'>Create auth links</a>
+            <a class="nav-link{% if pagename == "personauthlink-bulkcreate"%} active{%endif%}" href='{% url "membership:personauthlink-bulkcreate" %}'>Create auth links</a>
           </li>
         {% endif %}
         {% if perms.membership.view_tsclass %}
           <li class="nav-item">
-            <a class="nav-link{% ifequal pagename "tsclass" %} active{%endifequal%}" href='{% url "membership:class-list" %}'>Classes</a>
+            <a class="nav-link{% if pagename == "tsclass" %} active{%endif%}" href='{% url "membership:class-list" %}'>Classes</a>
           </li>
         {% endif %}
         {% if perms.gate.signin_app %}
           <li class="nav-item">
-            <a class="nav-link{% ifequal pagename "signin" %} active{%endifequal%}" href='{% url "gate:index" %}'>Gate&amp;Books</a>
+            <a class="nav-link{% if pagename == "signin" %} active{%endif%}" href='{% url "gate:index" %}'>Gate&amp;Books</a>
           </li>
         {% endif %}
         {% if user.is_staff %}

squaresdb/urls.py

@@ -13,24 +13,24 @@
     1. Add an import:  from blog import urls as blog_urls
     2. Add a URL to urlpatterns:  url(r'^blog/', include(blog_urls))
 """
-from django.conf.urls import include, url
 from django.contrib import admin
+from django.urls import include, path
 from django.views.generic.base import TemplateView
 
 import squaresdb.gate.urls
 import squaresdb.membership.urls
 import squaresdb.utils.socialauth
 
 urlpatterns = [
-    url(r'^$', TemplateView.as_view(template_name='index.html',
-                                    extra_context={'pagename':'homepage'}),
-        name='homepage'),
-    url(r'^admin/', admin.site.urls),
-    url(r'^membership/', squaresdb.membership.urls.urls()),
-    url(r'^gate/', squaresdb.gate.urls.urls()),
-    url(r'^accounts/', include('django.contrib.auth.urls')),
-    url(r'^sp$', TemplateView.as_view(template_name='sp.html'),
+    path('', TemplateView.as_view(template_name='index.html',
+                                  extra_context={'pagename':'homepage'}),
+         name='homepage'),
+    path('admin/', admin.site.urls),
+    path('membership/', squaresdb.membership.urls.urls()),
+    path('gate/', squaresdb.gate.urls.urls()),
+    path('accounts/', include('django.contrib.auth.urls')),
+    path('sp', TemplateView.as_view(template_name='sp.html'),
         name='saml-sp'),
-    url(r'^sauth/', include('social_django.urls', namespace='social')),
-    url(r'^saml_metadata/$', squaresdb.utils.socialauth.saml_metadata_view),
+    path('sauth/', include('social_django.urls', namespace='social')),
+    path('saml_metadata/', squaresdb.utils.socialauth.saml_metadata_view),
 ]