Skip to content

Commit 60ab226

Browse files
mattseymourpre-commit-ci[bot]Andrew-Chen-Wang
authored
Fixes #676 - Remove reference to django2.2 (#677)
* Fixes #676 - Remove reference to django2.2 Support for django 2.2 has come and gone. Let's move forwards. Commit removes references of django 2.2 as well as removing compatibility code found in compat.py. * Remove reference to django.core.urlresolvers (depricated django 1.10) * Remove CallableBool Tests have been update to reflect code changes. * Remove Django 2.2 from CI --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Andrew Chen Wang <[email protected]>
1 parent b0b8d1e commit 60ab226

File tree

8 files changed

+5
-70
lines changed

8 files changed

+5
-70
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@ jobs:
1616
max-parallel: 5
1717
matrix:
1818
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
19-
django-version: ['2.2', '3.2', '4.0', '4.1', 'main']
19+
django-version: ['3.2', '4.0', '4.1']
2020
drf-version: ['3.10', '3.11', '3.12', '3.13']
21-
exclude:
22-
- python-version: '3.7'
23-
django-version: 'main'
24-
- python-version: '3.10'
25-
django-version: '2.2'
2621

2722
steps:
2823
- uses: actions/checkout@v2

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ build-docs:
3838
tests/* \
3939
rest_framework_simplejwt/token_blacklist/* \
4040
rest_framework_simplejwt/backends.py \
41-
rest_framework_simplejwt/compat.py \
4241
rest_framework_simplejwt/exceptions.py \
4342
rest_framework_simplejwt/settings.py \
4443
rest_framework_simplejwt/state.py

rest_framework_simplejwt/compat.py

Lines changed: 0 additions & 55 deletions
This file was deleted.

rest_framework_simplejwt/models.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from django.db.models.manager import EmptyManager
33
from django.utils.functional import cached_property
44

5-
from .compat import CallableFalse, CallableTrue
65
from .settings import api_settings
76

87

@@ -95,11 +94,11 @@ def has_module_perms(self, module):
9594

9695
@property
9796
def is_anonymous(self):
98-
return CallableFalse
97+
return False
9998

10099
@property
101100
def is_authenticated(self):
102-
return CallableTrue
101+
return True
103102

104103
def get_username(self):
105104
return self.username

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
"Development Status :: 5 - Production/Stable",
6969
"Environment :: Web Environment",
7070
"Framework :: Django",
71-
"Framework :: Django :: 2.2",
7271
"Framework :: Django :: 3.2",
7372
"Framework :: Django :: 4.0",
7473
"Framework :: Django :: 4.1",

tests/test_integration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from datetime import timedelta
22

33
from django.contrib.auth import get_user_model
4+
from django.urls import reverse
45

5-
from rest_framework_simplejwt.compat import reverse
66
from rest_framework_simplejwt.settings import api_settings
77
from rest_framework_simplejwt.tokens import AccessToken
88

tests/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
from django.db import connection
44
from django.db.migrations.executor import MigrationExecutor
55
from django.test import TestCase, TransactionTestCase
6+
from django.urls import reverse
67
from rest_framework.test import APIClient
78

8-
from rest_framework_simplejwt.compat import reverse
99
from rest_framework_simplejwt.settings import api_settings
1010

1111

tox.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ python=
1616

1717
[gh-actions:env]
1818
DJANGO=
19-
2.2: dj22
2019
3.2: dj32
2120
4.0: dj40
2221
4.1: dj41
@@ -35,7 +34,6 @@ extras=
3534
setenv=
3635
PYTHONDONTWRITEBYTECODE=1
3736
deps=
38-
dj22: Django>=2.2,<2.3
3937
dj32: Django>=3.2,<3.3
4038
dj40: Django>=4.0,<4.1
4139
dj41: Django>=4.1,<4.2

0 commit comments

Comments
 (0)