From 6dc4f897220fed0c93f86f1b7c7b8799e561bde8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Tue, 18 Oct 2022 18:38:17 +0200
Subject: [PATCH] Release 2.2.0 (#1214)

* Release 2.2.0

* Sort AUTHORS alphabetically

Co-authored-by: Alan Crosswell <alan@columbia.edu>
---
 AUTHORS                     | 31 ++++++++++++++++---------------
 CHANGELOG.md                | 29 +++++++++++++++--------------
 oauth2_provider/__init__.py |  2 +-
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bfaff78ad..8d8547ecd 100644
--- a/AUTHORS
+++ b/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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02d9b8a6c..ffe572aba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,20 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-### 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
 
@@ -42,6 +29,20 @@ 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.
diff --git a/oauth2_provider/__init__.py b/oauth2_provider/__init__.py
index 9be84ded1..aedd5a37f 100644
--- a/oauth2_provider/__init__.py
+++ b/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"