From 0dcf2d8afe5c4bef0b9f44450dcabb410186095e Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Mon, 17 Jul 2023 20:46:02 +0500 Subject: [PATCH 1/2] feat: upgrade to django 4.2 --- .github/workflows/ci.yml | 5 ++--- CHANGELOG.rst | 1 + edx_api_doc_tools/__init__.py | 2 -- setup.py | 2 +- tox.ini | 29 ++++++++++++++++------------- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9095da3..b6537fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,8 +19,7 @@ jobs: [ py38-django32-drf312, py38-django32-drflatest, - py38-django40-drf312, - py38-django40-drflatest, + py38-django42-drflatest, quality, ] @@ -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 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2841a4d..df07709 100644 --- 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 +* Add support for Django 4.2 1.6.0 --- 2022-02-11 -------------------- diff --git a/edx_api_doc_tools/__init__.py b/edx_api_doc_tools/__init__.py index 50e866e..586530c 100644 --- a/edx_api_doc_tools/__init__.py +++ b/edx_api_doc_tools/__init__.py @@ -47,5 +47,3 @@ __version__ = '1.6.0' - -default_app_config = 'edx_api_doc_tools.apps.EdxApiDocToolsConfig' diff --git a/setup.py b/setup.py index 8fb7551..40b3ca3 100644 --- a/setup.py +++ b/setup.py @@ -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', diff --git a/tox.ini b/tox.ini index 24272b2..1c380fb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,8 @@ [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 @@ -7,35 +10,35 @@ 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 From da100ce0324f9205ef5bd882b08ecf5e6a29e15b Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Fri, 21 Jul 2023 17:18:15 +0500 Subject: [PATCH 2/2] fix: version bumped to 1.7.0 --- CHANGELOG.rst | 3 +++ edx_api_doc_tools/__init__.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index df07709..07d7879 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,9 @@ 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 diff --git a/edx_api_doc_tools/__init__.py b/edx_api_doc_tools/__init__.py index 586530c..201177b 100644 --- a/edx_api_doc_tools/__init__.py +++ b/edx_api_doc_tools/__init__.py @@ -46,4 +46,4 @@ ) -__version__ = '1.6.0' +__version__ = '1.7.0'