Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Added support for django42 #900

Merged
merged 5 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions submission_queue/urls.py
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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),
]
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38-django{32,40},quality
envlist = py38-django{32, 42},quality
skipsdist = True

[pycodestyle]
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions xqueue/urls.py
Original file line number Diff line number Diff line change
@@ -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')),
]
Loading