diff --git a/.circleci/config.yml b/.circleci/config.yml index 7032790..8745182 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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" diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index 8ecc9c6..0000000 --- a/dev-requirements.txt +++ /dev/null @@ -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 \ No newline at end of file diff --git a/dj_rest_auth/tests/requirements.pip b/dj_rest_auth/tests/requirements.pip index 66af74f..0692df1 100644 --- a/dj_rest_auth/tests/requirements.pip +++ b/dj_rest_auth/tests/requirements.pip @@ -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 diff --git a/dj_rest_auth/urls.py b/dj_rest_auth/urls.py index 92b99d2..81c6111 100644 --- a/dj_rest_auth/urls.py +++ b/dj_rest_auth/urls.py @@ -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):