From 888062fedf267abd21708cfb350a157a06237019 Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Wed, 22 Dec 2021 11:08:49 -0500 Subject: [PATCH 1/4] Fix wrong level of subheading. --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab5f630a9..548444f87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.6.1] unreleased +### Changed +* Miscellaneous packaging issues. + ## [1.6.0] 2021-12-19 ### Added * #949 Provide django.contrib.auth.authenticate() with a `request` for compatibiity with more backends (like django-axes). @@ -33,7 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * #991 Update documentation of [REFRESH_TOKEN_EXPIRE_SECONDS](https://django-oauth-toolkit.readthedocs.io/en/latest/settings.html#refresh-token-expire-seconds) to indicate it may be `int` or `datetime.timedelta`. * #977 Update [Tutorial](https://django-oauth-toolkit.readthedocs.io/en/stable/tutorial/tutorial_01.html#) to show required `include`. -## Removed +### Removed * #968 Remove support for Django 3.0 & 3.1 and Python 3.6 * #1035 Removes default_app_config for Django Deprecation Warning * #1023 six should be dropped From 421edf0f0db069afe28af8c0dcc67e7850e6af1d Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Wed, 22 Dec 2021 16:39:18 -0500 Subject: [PATCH 2/4] Move post-1.6.0 updates to 1.6.1. No backwards time travel! --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 548444f87..5f51cdeb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,14 +17,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## [1.6.1] unreleased + ### Changed * Miscellaneous packaging issues. +* Note: Only Django 4.0.1+ is supported due to a regression in Django 4.0.0. [Explanation](https://github.com/jazzband/django-oauth-toolkit/pull/1046#issuecomment-998015272) ## [1.6.0] 2021-12-19 ### Added * #949 Provide django.contrib.auth.authenticate() with a `request` for compatibiity with more backends (like django-axes). * #968, #1039 Add support for Django 3.2 and 4.0. - * Note: Only Django 4.0.1+ is supported due to a regression in Django 4.0.0. [Explanation](https://github.com/jazzband/django-oauth-toolkit/pull/1046#issuecomment-998015272) * #953 Allow loopback redirect URIs using random ports as described in [RFC8252 section 7.3](https://datatracker.ietf.org/doc/html/rfc8252#section-7.3). * #972 Add Farsi/fa language support. * #978 OIDC: Add support for [rotating multiple RSA private keys](https://django-oauth-toolkit.readthedocs.io/en/latest/oidc.html#rotating-the-rsa-private-key). From 8f3b812322f0525f05395cdd1d2a51f7e6bf5f70 Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Thu, 23 Dec 2021 15:17:53 -0500 Subject: [PATCH 3/4] Release 1.6.1 --- CHANGELOG.md | 6 ++++-- oauth2_provider/__init__.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f51cdeb2..f10cdf145 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,12 +16,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [1.6.1] unreleased +## [1.6.1] 2021-12-23 ### Changed -* Miscellaneous packaging issues. * Note: Only Django 4.0.1+ is supported due to a regression in Django 4.0.0. [Explanation](https://github.com/jazzband/django-oauth-toolkit/pull/1046#issuecomment-998015272) +### Fixed +* Miscellaneous 1.6.0 packaging issues. + ## [1.6.0] 2021-12-19 ### Added * #949 Provide django.contrib.auth.authenticate() with a `request` for compatibiity with more backends (like django-axes). diff --git a/oauth2_provider/__init__.py b/oauth2_provider/__init__.py index 12e29a6d0..68a0914f2 100644 --- a/oauth2_provider/__init__.py +++ b/oauth2_provider/__init__.py @@ -1,7 +1,7 @@ import django -__version__ = "1.6.0" +__version__ = "1.6.1" if django.VERSION < (3, 2): default_app_config = "oauth2_provider.apps.DOTConfig" From 714455aa58912053b4445665b171e57fb1a02b48 Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Thu, 23 Dec 2021 15:33:59 -0500 Subject: [PATCH 4/4] Fix missing _ for href. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 567c48ee2..8a9f333db 100644 --- a/README.rst +++ b/README.rst @@ -37,7 +37,7 @@ capabilities to your Django projects. Django OAuth Toolkit makes extensive use o Note: If you have issues installing Django 4.0.0, it is because we only support Django 4.0.1+ due to a regression in Django 4.0.0. Besides 4.0.0, Django 2.2+ is supported. -`Explanation `. +`Explanation `_. Contributing ------------