Skip to content

Commit

Permalink
Merge pull request #217 from openedx/zshkoor/django42
Browse files Browse the repository at this point in the history
feat: upgrade to django 4.2
  • Loading branch information
zubairshakoorarbisoft authored Jul 21, 2023
2 parents 33fc36b + da100ce commit d2674f8
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 20 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ jobs:
[
py38-django32-drf312,
py38-django32-drflatest,
py38-django40-drf312,
py38-django40-drflatest,
py38-django42-drflatest,
quality,
]

Expand All @@ -45,7 +44,7 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='py38-django32-drflatest'
if: matrix.python-version == '3.8' && matrix.toxenv=='py38-django42-drflatest'
uses: codecov/codecov-action@v3
with:
flags: unittests
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ Change Log
Unreleased
----------

1.7.0 --- 2023-07-23
--------------------

* Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is
deprecated
* Add support for Django 4.2

1.6.0 --- 2022-02-11
--------------------
Expand Down
4 changes: 1 addition & 3 deletions edx_api_doc_tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,4 @@
)


__version__ = '1.6.0'

default_app_config = 'edx_api_doc_tools.apps.EdxApiDocToolsConfig'
__version__ = '1.7.0'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,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',
Expand Down
29 changes: 16 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,41 +1,44 @@
[tox]
envlist = py38-django{32,40}-drf{312, latest}, quality
envlist =
py38-django{32}-drf{312, latest}
py38-django{42}-drf{latest} # Django 4.2 is not supported by DRF < 3.14
quality

[pytest]
DJANGO_SETTINGS_MODULE = test_settings
addopts = --cov edx_api_doc_tools --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
drf312: djangorestframework>=3.12,<3.13
django42: Django>=4.2,<4.3
drf312: djangorestframework>=3.13,<3.14
drflatest: djangorestframework
-r{toxinidir}/requirements/test.txt
commands =
commands =
pytest {posargs}

[testenv:docs]
setenv =
setenv =
DJANGO_SETTINGS_MODULE = test_settings
PYTHONPATH = {toxinidir}
allowlist_externals =
allowlist_externals =
make
rm
deps =
deps =
-r{toxinidir}/requirements/doc.txt
commands =
commands =
make build_docs

[testenv:quality]
setenv =
setenv =
PYTHONPATH = {toxinidir}
allowlist_externals =
allowlist_externals =
make
rm
deps =
deps =
-r{toxinidir}/requirements/quality.txt
commands =
commands =
make quality

0 comments on commit d2674f8

Please sign in to comment.