Merge branch 'master' into feature/oidc-rp-initiated-logout

jazzband · Apr 18, 2023 · cb395dc · cb395dc
2 parents e1e8b31 + 9dd1033
commit cb395dc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
-        django-version: ['2.2', '3.2', '4.0', '4.1', 'main']
+        django-version: ['2.2', '3.2', '4.0', '4.1', '4.2', 'main']
         exclude:
           # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
 
@@ -23,6 +23,8 @@ jobs:
             django-version: '4.0'
           - python-version: '3.7'
             django-version: '4.1'
+          - python-version: '3.7'
+            django-version: '4.2'
           - python-version: '3.7'
             django-version: 'main'
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
         exclude: ^(oauth2_provider/migrations/|tests/migrations/)

diff --git a/README.rst b/README.rst
@@ -35,11 +35,6 @@ capabilities to your Django projects. Django OAuth Toolkit makes extensive use o
 `OAuthLib <https://github.com/idan/oauthlib>`_, so that everything is
 `rfc-compliant <http://tools.ietf.org/html/rfc6749>`_.
 
-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 <https://github.com/jazzband/django-oauth-toolkit/pull/1046#issuecomment-998015272>`_.
-
-
 Reporting security issues
 -------------------------
 
@@ -49,7 +44,7 @@ Requirements
 ------------
 
 * Python 3.7+
-* Django 2.2, 3.2, or >=4.0.1
+* Django 2.2, 3.2, 4.0 (4.0.1+ due to a regression), 4.1, or 4.2
 * oauthlib 3.1+
 
 Installation

diff --git a/setup.cfg b/setup.cfg
@@ -16,6 +16,7 @@ classifiers =
 	Framework :: Django :: 3.2
 	Framework :: Django :: 4.0
 	Framework :: Django :: 4.1
+	Framework :: Django :: 4.2
 	Intended Audience :: Developers
 	License :: OSI Approved :: BSD License
 	Operating System :: OS Independent

diff --git a/tests/settings.py b/tests/settings.py
@@ -1,3 +1,6 @@
+import django
+
+
 ADMINS = ()
 
 MANAGERS = ADMINS
@@ -23,7 +26,8 @@
 SITE_ID = 1
 
 USE_I18N = True
-USE_L10N = True
+if django.VERSION < (4, 0):
+    USE_L10N = True
 USE_TZ = True
 
 MEDIA_ROOT = ""

diff --git a/tox.ini b/tox.ini
@@ -9,6 +9,7 @@ envlist =
     py{37,38,39,310}-dj32,
     py{38,39,310}-dj40,
     py{38,39,310,311}-dj41,
+    py{38,39,310,311}-dj42,
     py{310,311}-djmain,
 
 [gh-actions]
@@ -25,6 +26,7 @@ DJANGO =
     3.2: dj32
     4.0: dj40
     4.1: dj41
+    4.2: dj42
     main: djmain
 
 [pytest]
@@ -51,6 +53,7 @@ deps =
     dj32: Django>=3.2,<3.3
     dj40: Django>=4.0.0,<4.1
     dj41: Django>=4.1,<4.2
+    dj42: Django>=4.2,<4.3
     djmain: https://github.com/django/django/archive/main.tar.gz
     djangorestframework
     oauthlib>=3.1.0