From d104d98a898307909e9050aadbf007c104e0df0f Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 5 Sep 2022 10:29:52 +0100 Subject: [PATCH 1/3] Remove upper version bound on Django 4.1 --- AUTHORS | 1 + CHANGELOG.md | 1 + setup.cfg | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index f7e995f09..07c73ed17 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,6 +8,7 @@ Contributors ------------ Abhishek Patel +Adam Johnson Alan Crosswell Alejandro Mantecon Guillen Aleksander Vaskevich diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bbe6d414..4869f452d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] * Add 'code_verifier' parameter to token requests in documentation +* Remove upper version bound on Django, to allow upgrading to Django 4.1.1 bugfix release. ## [2.1.0] 2022-06-19 diff --git a/setup.cfg b/setup.cfg index d8a51fef1..7fc5a9243 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,7 @@ zip_safe = False # jwcrypto has a direct dependency on six, but does not list it yet in a release # Previously, cryptography also depended on six, so this was unnoticed install_requires = - django >= 2.2, <= 4.1 + django >= 2.2, != 4.0.0 requests >= 2.13.0 oauthlib >= 3.1.0 jwcrypto >= 0.8.0 From 0a6b4bbc429c6de56c6d0395c0363e993c7cce9e Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 5 Sep 2022 16:38:02 +0100 Subject: [PATCH 2/3] fully support Django 4.1 --- CHANGELOG.md | 1 + setup.cfg | 1 + tox.ini | 2 ++ 3 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4869f452d..ddb88a2f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] * Add 'code_verifier' parameter to token requests in documentation +* Support Django 4.1. * Remove upper version bound on Django, to allow upgrading to Django 4.1.1 bugfix release. ## [2.1.0] 2022-06-19 diff --git a/setup.cfg b/setup.cfg index 7fc5a9243..bd4817e64 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,6 +15,7 @@ classifiers = Framework :: Django :: 2.2 Framework :: Django :: 3.2 Framework :: Django :: 4.0 + Framework :: Django :: 4.1 Intended Audience :: Developers License :: OSI Approved :: BSD License Operating System :: OS Independent diff --git a/tox.ini b/tox.ini index 63a78e773..24a34de8c 100644 --- a/tox.ini +++ b/tox.ini @@ -8,6 +8,7 @@ envlist = py{37,38,39}-dj22, py{37,38,39,310}-dj32, py{38,39,310}-dj40, + py{38,39,310}-dj41, py{38,39,310}-djmain, [gh-actions] @@ -40,6 +41,7 @@ deps = dj22: Django>=2.2,<3 dj32: Django>=3.2,<3.3 dj40: Django>=4.0.0,<4.1 + dj41: Django>=4.1,<4.2 djmain: https://github.com/django/django/archive/main.tar.gz djangorestframework oauthlib>=3.1.0 From 6bc1646cf2426c42d7eaf95589756b30d93ada86 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 5 Sep 2022 16:38:31 +0100 Subject: [PATCH 3/3] sections in changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddb88a2f8..b11d7537f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,8 +15,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 --> ## [unreleased] + +### Added * Add 'code_verifier' parameter to token requests in documentation + +### Changed * Support Django 4.1. + +### Fixed * Remove upper version bound on Django, to allow upgrading to Django 4.1.1 bugfix release. ## [2.1.0] 2022-06-19