Skip to content

Commit 6a9e048

Browse files
authored
feat: add django 6.0 and python 3.14 support (#959)
* feat: add django 6.0 and python 3.14 support * fix: solve version dependency
1 parent 784a668 commit 6a9e048

File tree

5 files changed

+25
-8
lines changed

5 files changed

+25
-8
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Python
1919
uses: actions/setup-python@v6
2020
with:
21-
python-version: '3.10'
21+
python-version: '3.12'
2222

2323
- name: Install dependencies
2424
run: |

.github/workflows/test.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,24 @@ jobs:
1515
fail-fast: false
1616
max-parallel: 5
1717
matrix:
18-
python-version: ['3.10', '3.11', '3.12', '3.13']
19-
django-version: ['4.2', '5.0', '5.1', '5.2']
20-
drf-version: ['3.14', '3.15']
18+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
19+
django-version: ['4.2', '5.0', '5.1', '5.2', '6.0']
20+
drf-version: ['3.14', '3.15', '3.16']
2121
exclude:
2222
- drf-version: '3.14'
2323
django-version: '5.0'
2424
- drf-version: '3.14'
2525
django-version: '5.1'
26+
- python-version: '3.14'
27+
django-version: '4.2'
28+
- python-version: '3.14'
29+
django-version: '5.0'
30+
- python-version: '3.14'
31+
django-version: '5.1'
32+
- python-version: '3.11'
33+
django-version: '6.0'
34+
- python-version: '3.10'
35+
django-version: '6.0'
2636

2737
steps:
2838
- uses: actions/checkout@v5

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# If extensions (or modules to document with autodoc) are in another directory,
1515
# add these directories to sys.path here. If the directory is relative to the
1616
# documentation root, use os.path.abspath to make it absolute, like shown here.
17-
from pkg_resources import get_distribution
17+
from importlib.metadata import version
1818

1919
# -- General configuration ------------------------------------------------
2020

@@ -80,7 +80,7 @@ def django_configure():
8080
# built documents.
8181
#
8282
# The full version, including alpha/beta/rc tags.
83-
release = get_distribution("djangorestframework_simplejwt").version
83+
release = version("djangorestframework_simplejwt")
8484

8585
# The short X.Y version.
8686
version = ".".join(release.split(".")[:2])

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
"Framework :: Django :: 5.0",
8282
"Framework :: Django :: 5.1",
8383
"Framework :: Django :: 5.2",
84+
"Framework :: Django :: 6.0",
8485
"Intended Audience :: Developers",
8586
"License :: OSI Approved :: MIT License",
8687
"Operating System :: OS Independent",
@@ -90,6 +91,7 @@
9091
"Programming Language :: Python :: 3.11",
9192
"Programming Language :: Python :: 3.12",
9293
"Programming Language :: Python :: 3.13",
94+
"Programming Language :: Python :: 3.14",
9395
"Topic :: Internet :: WWW/HTTP",
9496
],
9597
)

tox.ini

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
envlist=
33
py{310,311,312}-dj42-drf{314,315}-pyjwt{171,2}-tests
44
py{310,311,312}-dj50-drf315-pyjwt{171,2}-tests
5-
py{310,311,312,313}-dj51-drf315-pyjwt{171,2}-tests
6-
py{311,312,313}-dj52-drf315-pyjwt{171,2}-tests
5+
py{310,311,312,313}-dj{51,52}-drf{315,316}-pyjwt{171,2}-tests
6+
py314-dj{52,60}-drf{315,316}-pyjwt{171,2}-tests
77
docs
88

99
[gh-actions]
@@ -12,16 +12,19 @@ python=
1212
3.11: py311
1313
3.12: py312, docs
1414
3.13: py313
15+
3.14: py314
1516

1617
[gh-actions:env]
1718
DJANGO=
1819
4.2: dj42
1920
5.0: dj50
2021
5.1: dj51
2122
5.2: dj52
23+
6.0: dj60
2224
DRF=
2325
3.14: drf314
2426
3.15: drf315
27+
3.16: drf316
2528

2629
[testenv]
2730
commands = pytest {posargs:tests} --cov-append --cov-report=xml --cov=rest_framework_simplejwt
@@ -35,8 +38,10 @@ deps=
3538
dj50: Django>=5.0,<5.1
3639
dj51: Django>=5.1,<5.2
3740
dj52: Django>=5.2,<5.3
41+
dj60: Django>=6.0,<6.1
3842
drf314: djangorestframework>=3.14,<3.15
3943
drf315: djangorestframework>=3.15,<3.16
44+
drf316: djangorestframework>=3.16,<3.17
4045
pyjwt171: pyjwt>=1.7.1,<1.8
4146
pyjwt2: pyjwt>=2,<3
4247
allowlist_externals=make

0 commit comments

Comments
 (0)