From d77fd19bb04c0cdaa981b548e4fcb66ea9362758 Mon Sep 17 00:00:00 2001 From: Peter Carnesciali Date: Fri, 26 Nov 2021 20:20:03 -0600 Subject: [PATCH 1/6] Removes default_app_config for Django Deprecation Warning --- oauth2_provider/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/oauth2_provider/__init__.py b/oauth2_provider/__init__.py index ebb0b28b5..5b6018861 100644 --- a/oauth2_provider/__init__.py +++ b/oauth2_provider/__init__.py @@ -1,3 +1 @@ __version__ = "1.5.0" - -default_app_config = "oauth2_provider.apps.DOTConfig" From 725621952a6b0ab4b4175ba48bf7a6211b04b57d Mon Sep 17 00:00:00 2001 From: Peter Carnesciali Date: Fri, 26 Nov 2021 21:07:47 -0600 Subject: [PATCH 2/6] Update AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 68960486a..e47665e66 100644 --- a/AUTHORS +++ b/AUTHORS @@ -46,6 +46,7 @@ Michael Howitz Paul Dekkers Paul Oswald Pavel Tvrdík +Peter Carnesciali Rodney Richardson Rustem Saiargaliev Sandro Rodrigues From cd4492344a5c12dc7aea1431ace703ce709e8dd4 Mon Sep 17 00:00:00 2001 From: Peter Carnesciali Date: Fri, 26 Nov 2021 23:00:45 -0600 Subject: [PATCH 3/6] Update __init__.py --- oauth2_provider/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oauth2_provider/__init__.py b/oauth2_provider/__init__.py index 5b6018861..a811936cf 100644 --- a/oauth2_provider/__init__.py +++ b/oauth2_provider/__init__.py @@ -1 +1,4 @@ __version__ = "1.5.0" + +if django.VERSION < (3, 2): + default_app_config = "oauth2_provider.apps.DOTConfig" From 8bd48c8be6b4186e76c4f2d37a064612052b277b Mon Sep 17 00:00:00 2001 From: Peter Carnesciali Date: Fri, 26 Nov 2021 23:02:59 -0600 Subject: [PATCH 4/6] import django --- oauth2_provider/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oauth2_provider/__init__.py b/oauth2_provider/__init__.py index a811936cf..6ae4b308a 100644 --- a/oauth2_provider/__init__.py +++ b/oauth2_provider/__init__.py @@ -1,3 +1,6 @@ +import django + + __version__ = "1.5.0" if django.VERSION < (3, 2): From d49e52a9784fd0e2ae4630d84f4729d209896524 Mon Sep 17 00:00:00 2001 From: Peter Carnesciali Date: Sat, 27 Nov 2021 16:43:37 -0600 Subject: [PATCH 5/6] Install django so tox tests work --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7d257b465..f1f734271 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,7 +37,7 @@ jobs: - name: Install Python dependencies run: | python -m pip install --upgrade pip - python -m pip install --upgrade tox tox-gh-actions + python -m pip install --upgrade tox tox-gh-actions django - name: Tox tests run: | From a6fcd37748fff181de009fa793a277f5b9c9c28e Mon Sep 17 00:00:00 2001 From: Peter Carnesciali Date: Fri, 10 Dec 2021 09:37:06 -0600 Subject: [PATCH 6/6] Pin mistune to fix docs --- docs/requirements.txt | 1 + tox.ini | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/requirements.txt b/docs/requirements.txt index c1f72699b..69501a2c6 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,5 @@ Django>=3.0,<3.1 oauthlib>=3.1.0 m2r>=0.2.1 +mistune<2 . diff --git a/tox.ini b/tox.ini index 8371aab0a..ebd9ffb6e 100644 --- a/tox.ini +++ b/tox.ini @@ -64,6 +64,7 @@ deps = sphinx<3 oauthlib>=3.1.0 m2r>=0.2.1 + mistune<2 sphinx-rtd-theme livedocs: sphinx-autobuild jwcrypto