Merge branch 'master' into zshkoor/django42-upgrade

.github/workflows/ci.yml

@@ -18,10 +18,9 @@ jobs:
         # excluding mysql5.7 with Django 4.2 since Django 4.2 has 
         # dropped support for MySQL<8
         exclude:
-          - django-version: 'django42'
+          - tox-env: 'django42'
             db-version: 'mysql57'
 
-
     steps:
     - uses: actions/checkout@v2
 

submission_queue/urls.py

@@ -1,4 +1,4 @@
-from django.urls import re_path
+from django.urls import path
 
 from submission_queue.ext_interface import (get_queuelen, get_submission,
                                             put_result)
@@ -8,21 +8,21 @@
 # General
 # ------------------------------------------------------------
 urlpatterns = [
-    re_path(r'^login/$', log_in),
-    re_path(r'^logout/$', log_out),
-    re_path(r'^status/$', status),
+    path('login/', log_in),
+    path('logout/', log_out),
+    path('status/', status),
 ]
 
 # LMS-facing interface for queue requests
 # ------------------------------------------------------------
 urlpatterns += [
-    re_path(r'^submit/$', submit),
+    path('submit/', submit),
 ]
 
 # External pulling interface
 # ------------------------------------------------------------
 urlpatterns += [
-    re_path(r'^get_queuelen/$', get_queuelen),
-    re_path(r'^get_submission/$', get_submission),
-    re_path(r'^put_result/$', put_result),
+    path('get_queuelen/', get_queuelen),
+    path('get_submission/', get_submission),
+    path('put_result/', put_result),
 ]

xqueue/urls.py

@@ -1,5 +1,6 @@
-from django.urls import include, re_path
+from django.urls import path
+from django.urls import include
 
 urlpatterns = [
-   re_path(r'^xqueue/', include('submission_queue.urls')),
+   path('xqueue/', include('submission_queue.urls')),
 ]