Merge branch 'master' into fix-docs-authorization-code-expire

Author: matiseni51

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
       - id: black
         exclude: ^(oauth2_provider/migrations/|tests/migrations/)
@@ -26,6 +26,6 @@ repos:
       - id: flake8
         exclude: ^(oauth2_provider/migrations/|tests/migrations/)
   - repo: https://github.com/sphinx-contrib/sphinx-lint
-    rev: v0.6.1
+    rev: v0.6.6
     hooks:
       - id: sphinx-lint

AUTHORS

@@ -3,7 +3,6 @@ Authors
 
 Massimiliano Pippi
 Federico Frenguelli
-Islam Kamel
 
 Contributors
 ------------
@@ -16,6 +15,7 @@ Aleksander Vaskevich
 Alessandro De Angelis
 Alex Szabó
 Allisson Azevedo
+Andrea Greco
 Andrej Zbín
 Andrew Chen Wang
 Anvesh Agarwal
@@ -28,26 +28,33 @@ Bas van Oostveen
 Brian Helba
 Carl Schwan
 Daniel 'Vector' Kerr
+Darrel O'Pry
 Dave Burkholder
 David Fischer
+David Hill
 David Smith
 Dawid Wolski
 Diego Garcia
+Dominik George
 Dulmandakh Sukhbaatar
 Dylan Giesler
 Dylan Tack
+Eduardo Oliveira
 Emanuele Palazzetti
 Federico Dolce
 Frederico Vieira
 Hasan Ramezani
-Hossein Shakiba
 Hiroki Kiyohara
+Hossein Shakiba
+Islam Kamel
+Jadiel Teófilo
 Jens Timmerman
 Jerome Leclanche
 Jesse Gibbs
 Jim Graham
 Jonas Nygaard Pedersen
 Jonathan Steffan
+Jordi Sanchez
 Joseph Abrahams
 Jozef Knaperek
 Julien Palard
@@ -56,32 +63,26 @@ Kaleb Porter
 Kristian Rune Larsen
 Matias Seniquiel
 Michael Howitz
+Owen Gong
+Patrick Palacin
 Paul Dekkers
 Paul Oswald
 Pavel Tvrdík
-Patrick Palacin
 Peter Carnesciali
+Peter Karman
 Petr Dlouhý
 Rodney Richardson
 Rustem Saiargaliev
+Rustem Saiargaliev
 Sandro Rodrigues
+Shaheed Haque
 Shaun Stanworth
 Silvano Cerza
 Spencer Carroll
 Stéphane Raimbault
 Tom Evans
+Vinay Karanam
+Víðir Valberg Guðmundsson
 Will Beaufoy
-Rustem Saiargaliev
-Jadiel Teófilo
 pySilver
 Łukasz Skarżyński
-Shaheed Haque
-Peter Karman
-Vinay Karanam
-Eduardo Oliveira
-Andrea Greco
-Dominik George
-David Hill
-Darrel O'Pry
-Jordi Sanchez
-Owen Gong

CHANGELOG.md

@@ -17,22 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [unreleased]
 
 ### Changed
-* #1211 documentation improvements.
+* #1211 documentation improve on 'AUTHORIZATION_CODE_EXPIRE_SECONDS'.
 
-### Added
-* Add 'code_challenge_method' parameter to authorization call in documentation
-
-### 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.
-* Handle oauthlib errors on create token requests
-
-## [2.1.0] 2022-06-19
+## [2.2.0] 2022-10-18
 
 ### WARNING
 
@@ -45,6 +32,19 @@ These issues both result in `{"error": "invalid_client"}`:
 
 2. `PKCE_REQUIRED` is now `True` by default. You should use PKCE with your client or set `PKCE_REQUIRED=False` if you are unable to fix the client.
 
+### Added
+* #1208 Add 'code_challenge_method' parameter to authorization call in documentation
+* #1182 Add 'code_verifier' parameter to token requests in documentation
+
+### Changed
+* #1203 Support Django 4.1.
+
+### Fixed
+* #1203 Remove upper version bound on Django, to allow upgrading to Django 4.1.1 bugfix release.
+* #1210 Handle oauthlib errors on create token requests
+
+## [2.1.0] 2022-06-19
+
 ### Added
 * #1164 Support `prompt=login` for the OIDC Authorization Code Flow end user [Authentication Request](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest).
 * #1163 Add French (fr) translations.

oauth2_provider/__init__.py

@@ -1,7 +1,7 @@
 import django
 
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 
 if django.VERSION < (3, 2):
     default_app_config = "oauth2_provider.apps.DOTConfig"