Skip to content

Commit bd2f780

Browse files
Merge pull request #92 from openedx/zshkoor/django42
feat: upgrade to Django 4.2
2 parents 5580dc9 + a1a070a commit bd2f780

File tree

10 files changed

+25
-20
lines changed

10 files changed

+25
-20
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
os: [ubuntu-20.04]
1717
python-version: ['3.8']
18-
toxenv: [quality, docs, django32, django40]
18+
toxenv: [quality, docs, django32, django42]
1919

2020
steps:
2121
- uses: actions/checkout@v2
@@ -36,7 +36,7 @@ jobs:
3636
run: tox
3737

3838
- name: Run Coverage
39-
if: matrix.python-version == '3.8' && matrix.toxenv=='django32'
39+
if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
4040
uses: codecov/codecov-action@v3
4141
with:
4242
flags: unittests

CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@ Change Log
1414
Unreleased
1515
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1616

17+
18+
[1.5.0] - 2023-07-21
19+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20+
1721
* Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is
1822
deprecated
23+
* Added Support for Django 4.2
1924

2025
[1.4.0] - 2022-05-23
2126
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

code_annotations/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Extensible tools for parsing annotations in codebases.
33
"""
44

5-
__version__ = '1.4.0'
5+
__version__ = '1.5.0'

requirements/dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# make upgrade
66
#
7-
asgiref==3.5.2
7+
asgiref==3.7.2
88
# via
99
# -r requirements/quality.txt
1010
# django

requirements/django.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# make upgrade
66
#
7-
asgiref==3.5.2
7+
asgiref==3.7.2
88
# via django
99
django==3.2.13
1010
# via

requirements/doc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ accessible-pygments==0.0.4
88
# via pydata-sphinx-theme
99
alabaster==0.7.12
1010
# via sphinx
11-
asgiref==3.5.2
11+
asgiref==3.7.2
1212
# via
1313
# -r requirements/test.txt
1414
# django

requirements/quality.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# make upgrade
66
#
7-
asgiref==3.5.2
7+
asgiref==3.7.2
88
# via
99
# -r requirements/test.txt
1010
# django

requirements/test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# make upgrade
66
#
7-
asgiref==3.5.2
7+
asgiref==3.7.2
88
# via
99
# -r requirements/django.txt
1010
# django

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def is_requirement(line):
9898
'Development Status :: 3 - Alpha',
9999
'Framework :: Django',
100100
'Framework :: Django :: 3.2',
101-
'Framework :: Django :: 4.0',
101+
'Framework :: Django :: 4.2',
102102
'Intended Audience :: Developers',
103103
'License :: OSI Approved :: Apache Software License',
104104
'Natural Language :: English',

tox.ini

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py38-django{32,40}
2+
envlist = py38-django{32, 42}
33

44
[doc8]
55
ignore = D001
@@ -16,23 +16,23 @@ addopts = --cov code_annotations --cov-report term-missing --cov-report xml
1616
norecursedirs = .* docs requirements
1717

1818
[testenv]
19-
deps =
19+
deps =
2020
django32: Django>=3.2,<4.0
21-
django40: Django>=4.0,<4.1
21+
django42: Django>=4.2,<4.3
2222
-r{toxinidir}/requirements/test.txt
23-
commands =
23+
commands =
2424
python -Wd -m pytest {posargs}
2525

2626
[testenv:docs]
27-
setenv =
27+
setenv =
2828
PYTHONPATH = {toxinidir}
29-
whitelist_externals =
29+
allowlist_externals =
3030
make
3131
rm
3232
twine
33-
deps =
33+
deps =
3434
-r{toxinidir}/requirements/doc.txt
35-
commands =
35+
commands =
3636
doc8 --ignore-path docs/_build README.rst docs
3737
rm -f docs/code_annotations.rst
3838
rm -f docs/modules.rst
@@ -42,11 +42,11 @@ commands =
4242
twine check dist/*
4343

4444
[testenv:quality]
45-
whitelist_externals =
45+
allowlist_externals =
4646
make
47-
deps =
47+
deps =
4848
-r{toxinidir}/requirements/quality.txt
49-
commands =
49+
commands =
5050
pylint code_annotations tests test_utils setup.py
5151
pycodestyle code_annotations tests setup.py
5252
pydocstyle code_annotations tests setup.py

0 commit comments

Comments
 (0)