From 43ba51434558ed90f7a7c3be4d00ee084b9f4224 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Thu, 14 Sep 2023 15:10:49 +0500 Subject: [PATCH 1/5] fix: Added support for django42 --- submission_queue/urls.py | 16 ++++++++-------- tox.ini | 3 ++- xqueue/urls.py | 5 +++-- 3 files changed, 13 insertions(+), 11 deletions(-) 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..bc8cbfe2 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,6 +14,7 @@ norecursedirs = .* jenkins load_tests log reports script test_framework xqueue [testenv] deps = django32: Django>=3.2,<4.0 + django42: Django>=4.2,<4.3 django40: Django>=4.0,<4.1 -r{toxinidir}/requirements/test.txt passenv = 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')), ] From 427f2f42c1d16daec4e53359116723fef2d0e86c Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Thu, 14 Sep 2023 18:28:02 +0500 Subject: [PATCH 2/5] fix: added django42 and django40 env removed --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59e21977..37d8a367 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ 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'] From 0185503fa26ce2256a7b94be1b567a6457126889 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Thu, 14 Sep 2023 18:35:15 +0500 Subject: [PATCH 3/5] fix: mysql57 db version excluded from matrix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37d8a367..5ea328f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: matrix: tox-env: [quality, django32, django42] python-version: [3.8] - db-version: ['mysql57', 'mysql80'] + db-version: ['mysql80'] steps: - uses: actions/checkout@v2 From 6672a73e0573baba27c4f292d6f56d24fa06dd95 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Wed, 20 Sep 2023 15:03:55 +0500 Subject: [PATCH 4/5] fix: added changes requested by sobhan --- .github/workflows/ci.yml | 8 +++++++- tox.ini | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ea328f0..bc2e5d60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,13 @@ jobs: matrix: tox-env: [quality, django32, django42] python-version: [3.8] - db-version: ['mysql80'] + db-version: ['mysql57', 'mysql80'] + django-version: ['4.2'] + # excluding mysql5.7 with Django 4.2 since Django 4.2 has + # dropped support for MySQL<8 + exclude: + - django-version: '4.2' + db-version: 'mysql57' steps: - uses: actions/checkout@v2 diff --git a/tox.ini b/tox.ini index bc8cbfe2..7ad98a2a 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,6 @@ norecursedirs = .* jenkins load_tests log reports script test_framework xqueue deps = django32: Django>=3.2,<4.0 django42: Django>=4.2,<4.3 - django40: Django>=4.0,<4.1 -r{toxinidir}/requirements/test.txt passenv = DB_HOST From eb2e6e36aa8f2294009f18341c1717d94be88b1a Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Wed, 20 Sep 2023 15:30:26 +0500 Subject: [PATCH 5/5] fix: djang-version replaced with tox-env --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc2e5d60..491aa9c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,10 @@ jobs: tox-env: [quality, django32, django42] python-version: [3.8] db-version: ['mysql57', 'mysql80'] - django-version: ['4.2'] # excluding mysql5.7 with Django 4.2 since Django 4.2 has # dropped support for MySQL<8 exclude: - - django-version: '4.2' + - tox-env: 'django42' db-version: 'mysql57' steps: