Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,28 @@ 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
- python-version: '3.8'
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
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand All @@ -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",
Expand All @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion tests/app/idp/requirements.txt
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 7 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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

Expand Down
Loading