Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update supported version or django-rest-knox to v4.1.0 [fixes #110] #112

Merged
merged 1 commit into from
Jan 19, 2020
Merged

Update supported version or django-rest-knox to v4.1.0 [fixes #110] #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Requirements
- social-auth-core (>=3.0, <4.0)
- social-auth-app-django (>=3.1, <4.0)
- [optional] djangorestframework-simplejwt (>=4.0.0)
- [optional] django-rest-knox (>=3.2.0, <4.0.0)
- [optional] django-rest-knox (>=4.0.0, <5.0.0)

Release notes
-------------
Expand Down
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ rest_social_auth release notes

master
------
- Update supported version of django-rest-knox (>=4.0.0, <5.0.0). v4 has breaking changes.

Issues: #110

v3.0.0
------
Expand Down
2 changes: 1 addition & 1 deletion requirements_optional.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
django-rest-knox<4.0.0
django-rest-knox>=4.0.0,<5.0.0
djangorestframework-simplejwt>=4.0.0
djangorestframework-jwt==1.11.0
4 changes: 2 additions & 2 deletions rest_social_auth/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ def get_token(self, obj):
)
raise

token = AuthToken.objects.create(obj)
return token
token_instance, token_key = AuthToken.objects.create(obj)
return token_key


class UserKnoxSerializer(KnoxSerializer, UserSerializer):
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ deps =
social-auth-app-django==3.1.0
djangorestframework-jwt
djangorestframework_simplejwt
django-rest-knox<4.0.0
django-rest-knox<5.0.0
django111: Django>=1.11,<1.12
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
Expand Down