From b174ef87ee771b5a24bc4dc517b081b587bbccb9 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Mon, 31 Jul 2023 18:08:40 +0500 Subject: [PATCH 1/4] fix: Added support for Django42 --- .github/workflows/ci.yml | 4 ++-- CHANGELOG.rst | 4 ++++ tox.ini | 2 +- workbench/__init__.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 456be9ce..4c3a6939 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: ['3.8'] - toxenv: [django32, django40] + toxenv: [django32, django42] steps: - uses: actions/checkout@v2 @@ -40,7 +40,7 @@ jobs: run: xvfb-run --server-args=-ac -- tox -e ${{ matrix.toxenv }} - name: Upload coverage to CodeCov - if: matrix.python-version == '3.8' && matrix.toxenv == 'django32' + if: matrix.python-version == '3.8' && matrix.toxenv == 'django42' uses: codecov/codecov-action@v3 with: file: ./coverage.xml diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d8ef4628..6ea8fbb1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,10 @@ Change history for XBlock SDK These are notable changes in XBlock. +0.7.0 +----- +* Added support for Django 4.2 + 0.6.0 ----- * Removed boto usage. diff --git a/tox.ini b/tox.ini index 5bf7b899..a9f30668 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ whitelist_externals = make 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 = DISPLAY diff --git a/workbench/__init__.py b/workbench/__init__.py index 86a59aff..32b28d2a 100644 --- a/workbench/__init__.py +++ b/workbench/__init__.py @@ -2,4 +2,4 @@ Provide a djangoapp for XBlock development """ -__version__ = '0.6.0' +__version__ = '0.7.0' From 426056e08ac910d15594f30fd4b6f836c4a9cd3d Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Mon, 31 Jul 2023 18:11:50 +0500 Subject: [PATCH 2/4] fix: Codemod changes added --- workbench/admin.py | 2 +- workbench/urls.py | 25 +++++++++++++------------ workbench/views.py | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/workbench/admin.py b/workbench/admin.py index 28269d9c..89c2c8ab 100644 --- a/workbench/admin.py +++ b/workbench/admin.py @@ -9,6 +9,7 @@ from .models import XBlockState +@admin.register(XBlockState) class XBlockStateAdmin(admin.ModelAdmin): """Basic admin operations for XBlockState model. @@ -25,4 +26,3 @@ class XBlockStateAdmin(admin.ModelAdmin): ] -admin.site.register(XBlockState, XBlockStateAdmin) diff --git a/workbench/urls.py b/workbench/urls.py index 97305c81..5dc89793 100644 --- a/workbench/urls.py +++ b/workbench/urls.py @@ -5,6 +5,7 @@ from django.conf.urls.static import static from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns +from django.urls import path from django.urls import re_path from workbench import views @@ -12,27 +13,27 @@ admin.autodiscover() urlpatterns = [ - re_path(r'^$', views.index, name='workbench_index'), - re_path( - r'^scenario/(?P[^/]+)/(?P[^/]+)/$', + path('', views.index, name='workbench_index'), + path( + 'scenario///', views.show_scenario, name='scenario' ), - re_path(r'^userlist/$', + path('userlist/', views.user_list, name='userlist'), - re_path( - r'^scenario/(?P[^/]+)/$', + path( + 'scenario//', views.show_scenario, name='workbench_show_scenario' ), - re_path( - r'^view/(?P[^/]+)/(?P[^/]+)/$', + path( + 'view///', views.show_scenario, {'template': 'workbench/blockview.html'} ), - re_path( - r'^view/(?P[^/]+)/$', + path( + 'view//', views.show_scenario, {'template': 'workbench/blockview.html'} ), @@ -56,8 +57,8 @@ views.package_resource, name='package_resource' ), - re_path( - r'^reset_state$', + path( + 'reset_state', views.reset_state, name='reset_state' ), diff --git a/workbench/views.py b/workbench/views.py index 57c99073..b3711de9 100644 --- a/workbench/views.py +++ b/workbench/views.py @@ -172,6 +172,6 @@ def reset_state(request): """Delete all state and reload the scenarios.""" log.info("RESETTING ALL STATE") reset_global_state() - referrer_url = request.META['HTTP_REFERER'] + referrer_url = request.headers['referer'] return redirect(referrer_url) From 095b9d0344a77e25039fe9def50c6f0b42ad486b Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Mon, 31 Jul 2023 18:16:48 +0500 Subject: [PATCH 3/4] fix: meta change reverted --- workbench/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workbench/views.py b/workbench/views.py index b3711de9..57c99073 100644 --- a/workbench/views.py +++ b/workbench/views.py @@ -172,6 +172,6 @@ def reset_state(request): """Delete all state and reload the scenarios.""" log.info("RESETTING ALL STATE") reset_global_state() - referrer_url = request.headers['referer'] + referrer_url = request.META['HTTP_REFERER'] return redirect(referrer_url) From 6f8b82387481cca2a1a0e55f9c3e13d6751cdb74 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 1 Aug 2023 23:15:11 +0500 Subject: [PATCH 4/4] fix: urls.py reverted --- workbench/urls.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/workbench/urls.py b/workbench/urls.py index 5dc89793..97305c81 100644 --- a/workbench/urls.py +++ b/workbench/urls.py @@ -5,7 +5,6 @@ from django.conf.urls.static import static from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns -from django.urls import path from django.urls import re_path from workbench import views @@ -13,27 +12,27 @@ admin.autodiscover() urlpatterns = [ - path('', views.index, name='workbench_index'), - path( - 'scenario///', + re_path(r'^$', views.index, name='workbench_index'), + re_path( + r'^scenario/(?P[^/]+)/(?P[^/]+)/$', views.show_scenario, name='scenario' ), - path('userlist/', + re_path(r'^userlist/$', views.user_list, name='userlist'), - path( - 'scenario//', + re_path( + r'^scenario/(?P[^/]+)/$', views.show_scenario, name='workbench_show_scenario' ), - path( - 'view///', + re_path( + r'^view/(?P[^/]+)/(?P[^/]+)/$', views.show_scenario, {'template': 'workbench/blockview.html'} ), - path( - 'view//', + re_path( + r'^view/(?P[^/]+)/$', views.show_scenario, {'template': 'workbench/blockview.html'} ), @@ -57,8 +56,8 @@ views.package_resource, name='package_resource' ), - path( - 'reset_state', + re_path( + r'^reset_state$', views.reset_state, name='reset_state' ),