Merge ce82edb into 820e507

README.md

@@ -16,7 +16,7 @@ Requirements
 - django (1.10, 1.11, 2.0)
 - djangorestframework (>=3.1, <4.0)
 - social-auth-core (>=1.7.0, <2.0)
-- social-auth-app-django (>=2.1, <3.0)
+- social-auth-app-django (>=3.1, <4.0)
 - [optional] djangorestframework-jwt (>=1.7.2)
 - [optional] django-rest-knox (>=3.2.0)
 
@@ -426,25 +426,36 @@ Example
 
 There is an [example project](https://github.com/st4lk/django-rest-social-auth/tree/master/example_project).
 
-- make sure you have rest-social-auth installed
-
-        pip install rest-social-auth
-
 - clone repo
 
-        git clone https://github.com/st4lk/django-rest-social-auth.git
+    ```bash
+    git clone https://github.com/st4lk/django-rest-social-auth.git
+    ```
 
 - step in example_project/
 
-        cd django-rest-social-auth/example_project
+    ```bash
+    cd django-rest-social-auth/example_project
+    ```
 
 - create database (sqlite3)
 
-        python manage.py migrate
+    ```bash
+    PYTHONPATH='../' python manage.py migrate
+    ```
+
+    Note:
+    <sub><sup>You can avoid `PYTHONPATH='../'` if you install the package locally:</sup></sub>
+    <sub><sup>`pip install rest-social-auth` or `python setup.py install`.</sup></sub>
+    <sub><sup>
+    But to my mind the PYTHONPATH prefix is more useful. No need to install anything and code of rest-social-auth will be always up-to-date, even if you change source code.
+    </sup></sub>
 
 - run development server
 
-        python manage.py runserver
+    ```bash
+    PYTHONPATH='../' python manage.py runserver
+    ```
 
 Example project already contains facebook, google and twitter app ids and secrets.
 These apps are configured to work only with http://127.0.0.1:8000/ domain. Google and Facebook providers support http://localhost:8000/ as well. But Twitter only support 127.0.0.1.

RELEASE_NOTES.md

@@ -4,6 +4,13 @@ rest_social_auth release notes
 master
 ------
 
+v1.5.0
+------
+- Update minimal required version of social-auth-app-django to 3.1.0
+- Minor updates in readme
+
+Issues: #70
+
 v1.4.0
 ------
 - Add django-rest-knox support

requirements.txt

@@ -1,4 +1,4 @@
 django>=1.10,<3.0
 djangorestframework<4.0
 social-auth-core<2.0
-social-auth-app-django>=2.1.0,<3.0
+social-auth-app-django>=3.1.0,<4.0

requirements_test.txt

@@ -1,4 +1,4 @@
-pytest-django==2.8.0
-httpretty==0.8.10
+pytest-django==3.4.4
+httpretty==0.9.6
 unittest2==1.0.1
 mock==1.3.0

rest_social_auth/__init__.py

@@ -1,2 +1,2 @@
 __author__ = 'st4lk'
-__version__ = '1.4.0'
+__version__ = '1.5.0'

tox.ini

@@ -17,19 +17,17 @@ basepython =
 deps =
     djangorestframework<4.0
     social-auth-core==1.7.0
-    social-auth-app-django==2.1.0
-    django18: Django>=1.8,<1.9
-    django19: Django>=1.9,<1.10
+    social-auth-app-django==3.1.0
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<1.12
     django20: Django>=2.0,<2.1
-    py27-django111: djangorestframework-jwt
-    py27-django111: coverage
+    py36-django111: djangorestframework-jwt
+    py36-django111: coverage
     -rrequirements_test.txt
 commands =
     py.test
 
-[testenv:py27-django111]
+[testenv:py36-django111]
 commands =
     coverage run --source=rest_social_auth -m py.test
     coverage report