Tivix/django-rest-auth
1
1
Fork 0
mirror of https://github.com/Tivix/django-rest-auth.git synced 2024-12-02 05:43:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120 from jazzband/3.1-compatibility

Browse Source 
Fixes tests not running explicitly declared versions + maintenance.
This commit is contained in:
Michael 2020-08-09 14:05:02 -05:00 committed by GitHub
commit a3a7c6a4bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -7,14 +7,14 @@ jobs:
docker:
- image: circleci/python:3.8.0
environment:
DJANGO_VERSION: 3.0.3
DRF: 3.11
DJANGO_VERSION: 3.1
DRF: 3.11.1
executor: docker/docker
steps:
- checkout
- run:
command: pip install --user -r dev-requirements.txt
name: "Pip Install dev requirements"
command: pip install --user Django==$DJANGO_VERSION djangorestframework==$DRF
name: "Pip install version-specific Django + DRF"
- run:
command: pip install --user -r dj_rest_auth/tests/requirements.pip
name: "Pip Install test requirements"

6
dev-requirements.txt
View File

@ -1,6 +0,0 @@
--editable .
responses>=0.5.0
djangorestframework-simplejwt==4.4.0
django-allauth>=0.25.0
coveralls>=1.11.1
unittest-xml-reporting>=3.0.2

2
dj_rest_auth/tests/requirements.pip
View File

@ -2,3 +2,5 @@ django-allauth>=0.25.0
responses>=0.5.0
flake8==2.4.0
djangorestframework-simplejwt==4.4.0
unittest-xml-reporting>=3.0.2
coveralls>=1.11.1

9
dj_rest_auth/urls.py
View File

@ -6,16 +6,13 @@ from django.conf import settings
urlpatterns = [
# URLs that do not require a session or valid token
path('password/reset/', PasswordResetView.as_view(),
name='rest_password_reset'),
path('password/reset/confirm/', PasswordResetConfirmView.as_view(),
name='rest_password_reset_confirm'),
path('password/reset/', PasswordResetView.as_view(), name='rest_password_reset'),
path('password/reset/confirm/', PasswordResetConfirmView.as_view(), name='rest_password_reset_confirm'),
path('login/', LoginView.as_view(), name='rest_login'),
# URLs that require a user to be logged in with a valid session / token.
path('logout/', LogoutView.as_view(), name='rest_logout'),
path('user/', UserDetailsView.as_view(), name='rest_user_details'),
path('password/change/', PasswordChangeView.as_view(),
name='rest_password_change'),
path('password/change/', PasswordChangeView.as_view(), name='rest_password_change'),
]
if getattr(settings, 'REST_USE_JWT', False):