Merge pull request #92 from openedx/zshkoor/django42

feat: upgrade to Django 4.2
openedx · Jul 21, 2023 · bd2f780 · bd2f780
2 parents 5580dc9 + a1a070a
commit bd2f780
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 20 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: [quality, docs, django32, django40]
+        toxenv: [quality, docs, django32, django42]
 
     steps:
     - uses: actions/checkout@v2
@@ -36,7 +36,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
@@ -14,8 +14,13 @@ Change Log
 Unreleased
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+
+[1.5.0] - 2023-07-21
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 * Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is
   deprecated
+* Added Support for Django 4.2
 
 [1.4.0] - 2022-05-23
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/code_annotations/__init__.py b/code_annotations/__init__.py
@@ -2,4 +2,4 @@
 Extensible tools for parsing annotations in codebases.
 """
 
-__version__ = '1.4.0'
+__version__ = '1.5.0'
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-asgiref==3.5.2
+asgiref==3.7.2
     # via
     #   -r requirements/quality.txt
     #   django

diff --git a/requirements/django.txt b/requirements/django.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-asgiref==3.5.2
+asgiref==3.7.2
     # via django
 django==3.2.13
     # via

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -8,7 +8,7 @@ accessible-pygments==0.0.4
     # via pydata-sphinx-theme
 alabaster==0.7.12
     # via sphinx
-asgiref==3.5.2
+asgiref==3.7.2
     # via
     #   -r requirements/test.txt
     #   django

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-asgiref==3.5.2
+asgiref==3.7.2
     # via
     #   -r requirements/test.txt
     #   django

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-asgiref==3.5.2
+asgiref==3.7.2
     # via
     #   -r requirements/django.txt
     #   django

diff --git a/setup.py b/setup.py
@@ -98,7 +98,7 @@ 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 :: Apache Software License',
         'Natural Language :: English',

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38-django{32,40}
+envlist = py38-django{32, 42}
 
 [doc8]
 ignore = D001
@@ -16,23 +16,23 @@ addopts = --cov code_annotations --cov-report term-missing --cov-report xml
 norecursedirs = .* docs requirements
 
 [testenv]
-deps = 
+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 = 
+commands =
     python -Wd -m pytest {posargs}
 
 [testenv:docs]
-setenv = 
+setenv =
     PYTHONPATH = {toxinidir}
-whitelist_externals = 
+allowlist_externals =
     make
     rm
     twine
-deps = 
+deps =
     -r{toxinidir}/requirements/doc.txt
-commands = 
+commands =
     doc8 --ignore-path docs/_build README.rst docs
     rm -f docs/code_annotations.rst
     rm -f docs/modules.rst
@@ -42,11 +42,11 @@ commands =
     twine check dist/*
 
 [testenv:quality]
-whitelist_externals = 
+allowlist_externals =
     make
-deps = 
+deps =
     -r{toxinidir}/requirements/quality.txt
-commands = 
+commands =
     pylint code_annotations tests test_utils setup.py
     pycodestyle code_annotations tests setup.py
     pydocstyle code_annotations tests setup.py