Merge pull request #400 from openedx/zshkoor/django42

fix: Added support for django 42
openedx · Aug 2, 2023 · 16daaac · 16daaac
2 parents 9225002 + c9e4845
commit 16daaac
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python-version: ['3.8']
-        toxenv: [py38-django32, py38-django40, quality]
+        toxenv: [py38-django32, py38-django42, quality]
 
     steps:
     - uses: actions/checkout@v2
@@ -36,7 +36,7 @@ jobs:
       run: tox
 
     - name: Run Coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv=='py38-django32'
+      if: matrix.python-version == '3.8' && matrix.toxenv=='py38-django42'
       uses: codecov/codecov-action@v1
       with:
         flags: unittests

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -16,6 +16,10 @@ Please See the `releases tab <https://github.com/openedx/xblock-lti-consumer/rel
 Unreleased
 ~~~~~~~~~~
 
+9.6.0 - 2023-08-01
+------------------
+* Added support for Django 4.2
+
 9.5.7 - 2023-07-27
 ------------------
 * Fixed ACS actions constant.

diff --git a/lti_consumer/__init__.py b/lti_consumer/__init__.py
@@ -4,4 +4,4 @@
 from .apps import LTIConsumerApp
 from .lti_xblock import LtiConsumerXBlock
 
-__version__ = '9.5.7'
+__version__ = '9.6.0'
diff --git a/lti_consumer/admin.py b/lti_consumer/admin.py
@@ -14,6 +14,7 @@
 )
 
 
+@admin.register(LtiConfiguration)
 class LtiConfigurationAdmin(admin.ModelAdmin):
     """
     Admin view for LtiConfiguration models.
@@ -23,6 +24,7 @@ class LtiConfigurationAdmin(admin.ModelAdmin):
     readonly_fields = ('location', 'config_id')
 
 
+@admin.register(CourseAllowPIISharingInLTIFlag)
 class CourseAllowPIISharingInLTIFlagAdmin(KeyedConfigurationModelAdmin):
     """
     Admin for enabling PII Sharing in LTI on course-by-course basis.
@@ -38,8 +40,6 @@ class CourseAllowPIISharingInLTIFlagAdmin(KeyedConfigurationModelAdmin):
     )
 
 
-admin.site.register(CourseAllowPIISharingInLTIFlag, CourseAllowPIISharingInLTIFlagAdmin)
-admin.site.register(LtiConfiguration, LtiConfigurationAdmin)
 admin.site.register(LtiAgsLineItem)
 admin.site.register(LtiAgsScore)
 admin.site.register(LtiDlContentItem)
diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
-envlist = py38-django{32,40}, quality
+envlist = py38-django{32,42}, quality
 
 [testenv]
 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
 commands = 
     make test