Tivix/django-rest-auth
1
1
Fork 0
mirror of https://github.com/Tivix/django-rest-auth.git synced 2025-02-17 02:10:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into developDemo

Browse Source
This commit is contained in:
Tabatha Memmott 2016-01-05 08:08:17 -08:00
commit 29669be296
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/installation.rst
View File

@ -38,7 +38,7 @@ You're good to go now!
Registration (optional) Registration (optional)
----------------------- -----------------------
1. If you want to enable standard registration process you will need to install ``django-allauth`` - see this doc for installation http://django-allauth.readthedocs.org/en/latest/installation.html. 1. If you want to enable standard registration process you will need to install ``django-allauth`` by using ``pip install django-rest-auth[extras]`` or ``pip install django-rest-auth[with_social]``.
2. Add ``allauth``, ``allauth.account`` and ``rest_auth.registration`` apps to INSTALLED_APPS in your django settings.py: 2. Add ``allauth``, ``allauth.account`` and ``rest_auth.registration`` apps to INSTALLED_APPS in your django settings.py:

2
rest_auth/tests/test_api.py
View File

@ -225,7 +225,7 @@ class APITestCase1(TestCase, BaseAPITestCase):
self.post(self.login_url, data=payload, status_code=200) self.post(self.login_url, data=payload, status_code=200)
def test_password_reset_with_email_in_different_case(self): def test_password_reset_with_email_in_different_case(self):
user = get_user_model().objects.create_user(self.USERNAME, self.EMAIL.lower(), self.PASS) get_user_model().objects.create_user(self.USERNAME, self.EMAIL.lower(), self.PASS)
# call password reset in upper case # call password reset in upper case
mail_count = len(mail.outbox) mail_count = len(mail.outbox)

7
setup.py
View File

@ -32,6 +32,13 @@ setup(
'djangorestframework>=3.1.0', 'djangorestframework>=3.1.0',
'six>=1.9.0', 'six>=1.9.0',
], ],
extras_require={
'with_social': ['django-allauth>=0.24.1'],
},
tests_require=[
'responses>=0.5.0',
'django-allauth>=0.24.1',
],
test_suite='runtests.runtests', test_suite='runtests.runtests',
include_package_data=True, include_package_data=True,
# cmdclass={}, # cmdclass={},