Merge pull request #306 from openedx/zshkoor/django42

fix: Added support for Django42
openedx · Aug 2, 2023 · 7d0eee0 · 7d0eee0
2 parents 80920f9 + 6f8b823
commit 7d0eee0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -2,4 +2,4 @@
 Provide a djangoapp for XBlock development
 """
 
-__version__ = '0.6.0'
+__version__ = '0.7.0'
diff --git 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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,10 @@ Change history for XBlock SDK @@
     These are notable changes in XBlock.
+.7.0
+    -----
+    * Added support for Django 4.2
 .6.0
     -----
     * Removed boto usage.
@@ Expand Down @@