diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59e21977..491aa9c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,9 +12,14 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - tox-env: [quality, django32, django40] + tox-env: [quality, django32, django42] python-version: [3.8] db-version: ['mysql57', 'mysql80'] + # excluding mysql5.7 with Django 4.2 since Django 4.2 has + # dropped support for MySQL<8 + exclude: + - tox-env: 'django42' + db-version: 'mysql57' steps: - uses: actions/checkout@v2 diff --git a/submission_queue/urls.py b/submission_queue/urls.py index dcf29ee6..d7443826 100644 --- a/submission_queue/urls.py +++ b/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), ] diff --git a/tox.ini b/tox.ini index 6cce29d8..7ad98a2a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,40},quality +envlist = py38-django{32, 42},quality skipsdist = True [pycodestyle] @@ -14,7 +14,7 @@ norecursedirs = .* jenkins load_tests log reports script test_framework xqueue [testenv] deps = django32: Django>=3.2,<4.0 - django40: Django>=4.0,<4.1 + django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt passenv = DB_HOST diff --git a/xqueue/urls.py b/xqueue/urls.py index 6f8cf5a4..b15c0145 100644 --- a/xqueue/urls.py +++ b/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')), ]