Merge pull request #658 from openedx/zshkoor/django42

fix: Added support for Django42
openedx · Aug 3, 2023 · 35cbd6d · 35cbd6d
2 parents 6ae524a + fcfe8e3
commit 35cbd6d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.8']
-        toxenv: [quality, django32, django40]
+        toxenv: [quality, django32, django42]
 
     steps:
     - uses: actions/checkout@v2
@@ -30,7 +30,7 @@ jobs:
       run: tox -e ${{ matrix.toxenv }}
 
     - name: Run Coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv == 'django32'
+      if: matrix.python-version == '3.8' && matrix.toxenv == 'django42'
       uses: codecov/codecov-action@v3
       with:
         flags: unittests

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,9 +7,14 @@ These are notable changes in XBlock.
 Unreleased
 ----------
 
+
+1.7.0 - 2023-08-03
+------------------
+
 * Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is
   deprecated.  See https://github.com/openedx/edx-sphinx-theme/issues/184 for
   more details.
+* Added support for Django 4.2
 
 1.6.1 - 2022-01-28
 ------------------

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38-django{32,40}, quality, docs
+envlist = py38-django{32,42}, quality, docs
 
 [pytest]
 DJANGO_SETTINGS_MODULE = xblock.test.settings
@@ -10,7 +10,7 @@ norecursedirs = .* docs requirements
 [testenv]
 deps = 
     django32: Django>=3.2,<4.0
-    django40: Django>=4.0,<4.1
+    django42: Django>=4.2,<4.3
     -r requirements/test.txt
 changedir = {envsitepackagesdir}
 commands = 

diff --git a/xblock/__init__.py b/xblock/__init__.py
@@ -27,4 +27,4 @@ def __init__(self, *args, **kwargs):
 # without causing a circular import
 xblock.fields.XBlockMixin = XBlockMixin
 
-__version__ = '1.6.2'
+__version__ = '1.7.0'