feat: upgrade to Django 4.2

openedx · Jul 17, 2023 · 2f11b22 · 2f11b22
1 parent db15604
commit 2f11b22
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python-version: ['3.8']
-        toxenv: [quality, docs, django32, django40]
+        toxenv: [quality, docs, django32, django42]
 
     steps:
     - uses: actions/checkout@v2
@@ -34,7 +34,7 @@ jobs:
       run: tox
 
     - 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
@@ -16,6 +16,7 @@ Unreleased
 
 * Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is
   deprecated
+* Added support for django 4.2
 
 [1.6.1] - 2023-02-07
 ~~~~~~~~~~~~~~~~~~~~

diff --git a/edx_ace/__init__.py b/edx_ace/__init__.py
@@ -15,7 +15,6 @@
 
 __version__ = '1.6.1'
 
-default_app_config = 'edx_ace.apps.EdxAceConfig'
 
 __all__ = [
     'send',

diff --git a/setup.py b/setup.py
@@ -121,12 +121,11 @@ def is_requirement(line):
         'Development Status :: 3 - Alpha',
         'Framework :: Django',
         'Framework :: Django :: 3.2',
-        'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.8',
     ],
     entry_points={

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
-envlist = py38-django{32,40}, quality
+envlist = py38-django{32, 42}, quality
 
 [testenv]
-deps = 
+deps =
     django32: Django>=3.2,<4.0
-    django40: Django>=4.0,<4.1
-    quality: Django>=3.2,<4.0
+    django42: Django>=4.2,<4.3
+    quality: Django>=4.2,<4.3
     -r{toxinidir}/requirements/test.txt
     -r{toxinidir}/requirements/quality.txt
 commands =
@@ -15,7 +15,7 @@ commands =
 setenv =
     DJANGO_SETTINGS_MODULE = test_settings
     PYTHONPATH = {toxinidir}
-whitelist_externals =
+allowlist_externals =
     make
     rm
 deps =
@@ -33,7 +33,7 @@ setenv =
     DJANGO_SETTINGS_MODULE=test_settings
     PYTHONPATH = {toxinidir}/:{toxinidir}/edx_ace
 basepython = python3.8
-whitelist_externals =
+allowlist_externals =
     make
     rm
     touch