Skip to content

Commit 2e5f7a7

Browse files
committed
support Django 4.1 and 4.2, Django mongoengine 0.5.6, django rest framework 3.15
1 parent 4e78a51 commit 2e5f7a7

File tree

5 files changed

+82
-44
lines changed

5 files changed

+82
-44
lines changed

.github/workflows/test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
max-parallel: 5
2424
matrix:
2525
python-version: ['3.8', '3.9', '3.10', '3.11']
26-
django-version: ['3.2', '4.0']
27-
drf-version: ['3.11', '3.12', '3.13', '3.14']
26+
django-version: ['4.1', '4.2']
27+
drf-version: ['3.14', '3.15']
2828
# mongoengine-version: ['0.22', '0.23', '0.24']
29-
django-mongoengine-version: ['0.5.4']
29+
django-mongoengine-version: ['0.5.6']
3030
pyjwt-version: ['1.7.1', '2']
3131

3232
steps:

requirements/dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
django>=3.2,<4.1
2-
djangorestframework>=3.11
1+
django>=3.2,<4.3
2+
djangorestframework>=3.12
33
mongoengine>=0.20.0
4-
django-mongoengine>=0.5
4+
django-mongoengine>=0.5.4

requirements/test.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
pip==23.0
1+
pip==24.0
22
bump2version==1.0.1
3-
wheel==0.38.4
4-
watchdog==2.2.1
5-
flake8==6.0.0
6-
tox==4.4.5
7-
coverage==7.1.0
8-
Sphinx==6.1.3
9-
twine==4.0.2
3+
wheel==0.43.0
4+
watchdog==4.0.1
5+
flake8==7.0.0
6+
tox==4.15.0
7+
coverage==7.5.2
8+
Sphinx==c
9+
twine==5.1.0
1010

11-
pytest==7.2.1
11+
pytest==8.2.1
1212

13-
cryptography==39.0.1
13+
cryptography==42.0.7
1414
python-jose==3.3.0

setup.py

Lines changed: 46 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,52 @@
77
from setuptools import find_packages, setup
88

99
requirements = [
10-
"django>=3.2,<4.1",
11-
"djangorestframework>=3.11",
10+
"django>=3.2,<4.3",
11+
"djangorestframework>=3.12",
1212
"django-mongoengine>=0.5.4",
1313
"pyjwt>=1.7.1,<3",
1414
]
1515

16-
test_requirements = [
17-
"pytest>=3",
18-
]
16+
extras_require = {
17+
"test": [
18+
"cryptography",
19+
"coverage",
20+
"freezegun",
21+
"psutil",
22+
"python-jose",
23+
"pytest-cov",
24+
"pytest-django",
25+
"pytest-xdist",
26+
"pytest",
27+
"tox",
28+
],
29+
"lint": [
30+
"flake8",
31+
"pep8",
32+
"isort",
33+
],
34+
"doc": [
35+
"Sphinx>=7",
36+
"sphinx_rtd_theme>=2.0.0",
37+
],
38+
"dev": [
39+
"pytest-watch",
40+
"wheel",
41+
"twine",
42+
"ipython",
43+
],
44+
"python-jose": [
45+
"python-jose==3.3.0",
46+
],
47+
}
48+
49+
extras_require["dev"] = (
50+
extras_require["dev"]
51+
+ extras_require["test"]
52+
+ extras_require["lint"]
53+
+ extras_require["doc"]
54+
+ extras_require["python-jose"]
55+
)
1956

2057
setup(
2158
author="Đỗ Ngọc Ngoạn (aka Ngoan Do)",
@@ -26,7 +63,8 @@
2663
"Environment :: Web Environment",
2764
"Framework :: Django",
2865
"Framework :: Django :: 3.2",
29-
"Framework :: Django :: 4.0",
66+
"Framework :: Django :: 4.1",
67+
"Framework :: Django :: 4.2",
3068
"Intended Audience :: Developers",
3169
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
3270
"Natural Language :: English",
@@ -41,8 +79,10 @@
4179
description="Simple JWT is a JSON Web Token authentication plugin for the Django REST Framework which to be compatible with MongoEngine.", # noqa: E501
4280
long_description=Path("README.rst").read_text(encoding="utf-8"),
4381
install_requires=requirements,
82+
extras_require=extras_require,
4483
license="GNU General Public License v3",
4584
include_package_data=True,
85+
zip_safe=False,
4686
keywords="djangorestframework_simplejwt_mongoengine",
4787
name="djangorestframework_simplejwt_mongoengine",
4888
packages=find_packages(
@@ -52,8 +92,6 @@
5292
]
5393
),
5494
test_suite="tests",
55-
tests_require=test_requirements,
5695
url="https://github.com/ngocngoan/djangorestframework-simplejwt-mongoengine",
5796
version="1.2.1",
58-
zip_safe=False,
5997
)

tox.ini

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
[tox]
22
envlist =
3-
py3{8,9,10,11}-dj{32,40}-drf{311,312,313,314}-djme0{54}-pyjwt{171,2}
3+
py3{8,9,10,11}-dj32-drf{312,313,314,315}-djme0{54,55,56}-pyjwt{171,2}-tests
4+
py3{8,9,10,11}-dj{41,42}-drf{314,315}-djme0{56}-pyjwt{171,2}-tests
5+
; py312-dj42-drf{314,315}-djme0{56}-pyjwt{171,2}-tests - some packages are not compatible with python 3.12
6+
; py3{10,11,12}-dj50-drf315-djme0{56}-pyjwt{171,2}-tests
47

58
[gh-actions]
69
python =
10+
3.12: py312
711
3.11: py311
812
3.10: py310
913
3.9: py39
@@ -12,20 +16,19 @@ python =
1216
[gh-actions:env]
1317
DJANGO=
1418
3.2: dj32
15-
4.0: dj40
19+
4.1: dj41
20+
4.2: dj42
21+
5.0: dj50
1622
DRF=
1723
3.11: drf311
1824
3.12: drf312
1925
3.13: drf313
2026
3.14: drf314
21-
ME=
22-
0.20: me020
23-
0.21: me021
24-
0.22: me022
25-
0.23: me023
26-
0.24: me024
27+
3.15: drf315
2728
DJME=
2829
0.5.4: djme054
30+
0.5.5: djme055
31+
0.5.6: djme056
2932
PYJWT=
3033
1.7.1: pyjwt171
3134
2: pyjwt2
@@ -41,28 +44,25 @@ setenv =
4144
PYTHONDONTWRITEBYTECODE=1
4245
extras=
4346
test
44-
python-jose
4547
deps =
4648
dj32: Django>=3.2,<4.0
47-
dj40: Django>=4.0,<4.1
49+
dj41: Django>=4.1,<4.2
50+
dj42: Django>=4.2,<5.0
51+
dj50: Django>=5.0,<5.1
4852

49-
drf311: djangorestframework>=3.11,<3.12
5053
drf312: djangorestframework>=3.12,<3.13
5154
drf313: djangorestframework>=3.13,<3.14
5255
drf314: djangorestframework>=3.14,<3.15
56+
drf315: djangorestframework>=3.15,<3.16
5357

54-
me020: mongoengine>=0.20,<0.21
55-
me021: mongoengine>=0.21,<0.22
56-
me022: mongoengine>=0.22,<0.23
57-
me023: mongoengine>=0.23,<0.24
58-
me024: mongoengine>=0.24,<0.25
59-
60-
djme054: django-mongoengine>=0.5.4,<0.6
58+
djme054: django-mongoengine>=0.5.4,<0.5.5
59+
djme055: django-mongoengine>=0.5.5,<0.5.6
60+
djme056: django-mongoengine>=0.5.6,<0.6
6161

6262
pyjwt171: pyjwt>=1.7.1,<1.8
6363
pyjwt2: pyjwt>=2,<3
64-
65-
-r{toxinidir}/requirements/test.txt
6664
commands =
6765
pip install -U pip
6866
pytest --basetemp={envtmpdir} -p no:warnings
67+
rm -rf .tox
68+
rm -rf .mypy_cache

0 commit comments

Comments
 (0)