From 3d0a621f49225b98579edf22e25942512d74ca22 Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Sat, 24 Apr 2021 00:16:23 +0200 Subject: [PATCH 1/4] Remove support for Django 3.0. --- CHANGELOG.md | 1 + README.rst | 2 +- setup.cfg | 1 - tox.ini | 3 +-- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af3fdae3a..289258778 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 --> ## [unreleased] +* Remove support for Django 3.0 ### Added * #712, #636, #808. Calls to `django.contrib.auth.authenticate()` now pass a `request` diff --git a/README.rst b/README.rst index c96cb28be..7895c48db 100644 --- a/README.rst +++ b/README.rst @@ -42,7 +42,7 @@ Requirements ------------ * Python 3.6+ -* Django 2.1+ +* Django 2.2+ * oauthlib 3.1+ Installation diff --git a/setup.cfg b/setup.cfg index 13d6cd0f9..80ca51c6d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,7 +13,6 @@ classifiers = Environment :: Web Environment Framework :: Django Framework :: Django :: 2.2 - Framework :: Django :: 3.0 Framework :: Django :: 3.1 Intended Audience :: Developers License :: OSI Approved :: BSD License diff --git a/tox.ini b/tox.ini index 3016d024c..1cb4771a8 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = flake8, docs, - py{36,37,38,39}-dj{31,30,22}, + py{36,37,38,39}-dj{31,22}, py{38,39}-djmain, [gh-actions] @@ -33,7 +33,6 @@ setenv = PYTHONWARNINGS = all deps = dj22: Django>=2.2,<3 - dj30: Django>=3.0,<3.1 dj31: Django>=3.1,<3.2 djmain: https://github.com/django/django/archive/main.tar.gz djangorestframework From 427b0b932e574d68d952affa322ea84e80d8f9fc Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Sat, 24 Apr 2021 00:29:57 +0200 Subject: [PATCH 2/4] Add support for Django 3.2 --- CHANGELOG.md | 1 + setup.cfg | 1 + tox.ini | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 289258778..0b2deb05d 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] * Remove support for Django 3.0 +* Add support for Django 3.2 ### Added * #712, #636, #808. Calls to `django.contrib.auth.authenticate()` now pass a `request` diff --git a/setup.cfg b/setup.cfg index 80ca51c6d..3d8c4cfec 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,6 +14,7 @@ classifiers = Framework :: Django Framework :: Django :: 2.2 Framework :: Django :: 3.1 + Framework :: Django :: 3.2 Intended Audience :: Developers License :: OSI Approved :: BSD License Operating System :: OS Independent diff --git a/tox.ini b/tox.ini index 1cb4771a8..8371aab0a 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = flake8, docs, - py{36,37,38,39}-dj{31,22}, + py{36,37,38,39}-dj{32,31,22}, py{38,39}-djmain, [gh-actions] @@ -34,6 +34,7 @@ setenv = deps = dj22: Django>=2.2,<3 dj31: Django>=3.1,<3.2 + dj32: Django>=3.2,<3.3 djmain: https://github.com/django/django/archive/main.tar.gz djangorestframework oauthlib>=3.1.0 From eadc4589d9a07a0f0fd4d1556f3739a46c07aaf4 Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Sat, 24 Apr 2021 00:30:26 +0200 Subject: [PATCH 3/4] Add supported Python and Django badges. --- README.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.rst b/README.rst index 7895c48db..fe435987f 100644 --- a/README.rst +++ b/README.rst @@ -18,6 +18,14 @@ Django OAuth Toolkit :target: https://codecov.io/gh/jazzband/django-oauth-toolkit :alt: Coverage +.. image:: https://img.shields.io/pypi/pyversions/django-oauth-toolkit.svg + :target: https://pypi.org/project/django-oauth-toolkit/ + :alt: Supported Python versions + +.. image:: https://img.shields.io/pypi/djversions/django-oauth-toolkit.svg + :target: https://pypi.org/project/django-oauth-toolkit/ + :alt: Supported Django versions + If you are facing one or more of the following: * Your Django app exposes a web API you want to protect with OAuth2 authentication, * You need to implement an OAuth2 authorization server to provide tokens management for your infrastructure, From d2862e3ae15d1afee4ddf416b32e59db5c6578d0 Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Sat, 24 Apr 2021 00:38:02 +0200 Subject: [PATCH 4/4] Added my name to AUTHORS. --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 37f2cbdde..50589287a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -28,6 +28,7 @@ Dylan Giesler Emanuele Palazzetti Federico Dolce Frederico Vieira +Hasan Ramezani Hiroki Kiyohara Jens Timmerman Jerome Leclanche