From e0a3dedda8106ba80cf7f6e3937f6a3ed2d4b05f Mon Sep 17 00:00:00 2001
From: Darrel O'Pry <darrel.opry@spry-group.com>
Date: Sun, 2 Nov 2025 01:42:07 -0400
Subject: [PATCH] feat: django 5.2 support

which add python 3.14 in turn
---
 .github/workflows/test.yml     | 11 +++++++++++
 CHANGELOG.md                   |  6 +++++-
 README.rst                     |  4 ++--
 docs/index.rst                 |  4 ++--
 pyproject.toml                 |  5 ++++-
 tests/app/idp/requirements.txt |  2 +-
 tox.ini                        | 10 +++++++---
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b4cdaa8fa..d45418595 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,10 +19,12 @@ jobs:
         - '3.10'
         - '3.11'
         - '3.12'
+        - '3.13'
         django-version:
         - '4.2'
         - '5.0'
         - '5.1'
+        - '5.2'
         - 'main'
         include:
           # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
@@ -30,6 +32,15 @@ jobs:
             django-version: '4.2'
           - python-version: '3.9'
             django-version: '4.2'
+          - python-version: '3.14'
+            django-version: '5.2'
+          - python-version: '3.14'
+            django-version: 'main'
+        exclude:
+          - python-version: '3.13'
+            django-version: '5.0'
+          - python-version: '3.13'
+            django-version: '4.2'
 
     steps:
     - uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f17685ee..f2d44ba4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [unreleased]
-<!--
+
 ### Added
+* Support for Django 5.2
+* Support for Python 3.14 (Django >= 5.2.8)
+
+<!--
 ### Changed
 ### Deprecated
 ### Removed
diff --git a/README.rst b/README.rst
index e58098806..8038cea7a 100644
--- a/README.rst
+++ b/README.rst
@@ -39,8 +39,8 @@ Please report any security issues to the Django OAuth security team at <django-o
 Requirements
 ------------
 
-* Python 3.8+
-* Django 4.2, 5.0 or 5.1
+* Python 3.8, 3.9, 3.10, 3.11, 3.12, 3.13 or 3.14
+* Django 4.2, 5.0, 5.1 or 5.2
 * oauthlib 3.2.2+
 
 Installation
diff --git a/docs/index.rst b/docs/index.rst
index 8519827ed..386f85928 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,8 +21,8 @@ If you need help please submit a `question <https://github.com/django-oauth/djan
 Requirements
 ------------
 
-* Python 3.8+
-* Django 4.2, 5.0 or 5.1
+* Python 3.8, 3.9, 3.10, 3.11, 3.12, 3.13 or 3.14
+* Django 4.2, 5.0, 5.1 or 5.2
 * oauthlib 3.2.2+
 
 Index
diff --git a/pyproject.toml b/pyproject.toml
index 2bb4a83b2..0c3d32a99 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "django-oauth-toolkit"
 dynamic = ["version"]
-requires-python = ">= 3.8"
+requires-python = ">=3.8,<=3.14"
 authors = [
   {name = "Federico Frenguelli"},
   {name = "Massimiliano Pippi"},
@@ -22,6 +22,7 @@ classifiers = [
 	"Framework :: Django :: 4.2",
 	"Framework :: Django :: 5.0",
 	"Framework :: Django :: 5.1",
+	"Framework :: Django :: 5.2",
 	"Intended Audience :: Developers",
 	"License :: OSI Approved :: BSD License",
 	"Operating System :: OS Independent",
@@ -31,6 +32,8 @@ classifiers = [
 	"Programming Language :: Python :: 3.10",
 	"Programming Language :: Python :: 3.11",
 	"Programming Language :: Python :: 3.12",
+	"Programming Language :: Python :: 3.13",
+	"Programming Language :: Python :: 3.14",
 	"Topic :: Internet :: WWW/HTTP",
 ]
 dependencies = [
diff --git a/tests/app/idp/requirements.txt b/tests/app/idp/requirements.txt
index ec77fcf9d..f607463d7 100644
--- a/tests/app/idp/requirements.txt
+++ b/tests/app/idp/requirements.txt
@@ -1,4 +1,4 @@
-Django>=4.2,<=5.1
+Django>=4.2,<=5.2
 django-cors-headers==3.14.0
 django-environ==0.11.2
 
diff --git a/tox.ini b/tox.ini
index d5cf8d2dc..0a85f5fb8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,10 +5,11 @@ envlist =
     docs,
     lint,
     sphinxlint,
-    py{38,39,310,311,312,313}-dj42,
+    py{38,39,310,311,312}-dj42,
     py{310,311,312,313}-dj50,
     py{310,311,312,313}-dj51,
-    py{310,311,312,313}-djmain,
+    py{310,311,312,313,314}-dj52,
+    py{310,311,312,313,314}-djmain,
     py39-multi-db-dj-42
 
 [gh-actions]
@@ -19,12 +20,14 @@ python =
     3.11: py311
     3.12: py312
     3.13: py313
+    3.14: py314
 
 [gh-actions:env]
 DJANGO =
     4.2: dj42
     5.0: dj50
     5.1: dj51
+    5.2: dj52
     main: djmain
 
 [testenv]
@@ -40,6 +43,7 @@ deps =
     dj42: Django>=4.2,<4.3
     dj50: Django>=5.0,<5.1
     dj51: Django>=5.1,<5.2
+    dj52: Django>=5.2,<6.0
     djmain: https://github.com/django/django/archive/main.tar.gz
     djangorestframework
     oauthlib>=3.2.2
@@ -55,7 +59,7 @@ deps =
 passenv =
     PYTEST_ADDOPTS
 
-[testenv:py{310,311,312,313}-djmain]
+[testenv:py{310,311,312,313,314}-djmain]
 ignore_errors = true
 ignore_outcome = true