Merge pull request #33 from ovidner/master

Added Django 1.10 support

.travis.yml

@@ -4,14 +4,15 @@ python:
   - 2.7
 
 env:
-  - TOXENV=py34-django17
   - TOXENV=py34-django18
   - TOXENV=py34-django19
+  - TOXENV=py34-django110
   - TOXENV=py35-django18
   - TOXENV=py35-django19
-  - TOXENV=py27-django17
+  - TOXENV=py35-django110
   - TOXENV=py27-django18
   - TOXENV=py27-django19
+  - TOXENV=py27-django110
 
 branches:
     only:
@@ -23,7 +24,7 @@ install: pip install --quiet tox
 script: tox
 
 after_script:
-    - if [ $TOXENV == "py27-django19" ]; then
+    - if [ $TOXENV == "py27-django110" ]; then
         pip install --quiet coveralls;
         coveralls;
       fi

README.md

@@ -13,7 +13,7 @@ Requirements
 -----------
 
 - python (2.7, 3.4, 3.5)
-- django (1.7, 1.8, 1.9)
+- django (1.8, 1.9, 1.10)
 - djangorestframework (>= 3.1)
 - python-social-auth (>=0.2.9)
 - [optional] djangorestframework-jwt (>=1.7.2)
@@ -446,3 +446,4 @@ Contributors
 - Deshraj Yadav, [DESHRAJ](https://github.com/DESHRAJ)
 - georgewhewell, [georgewhewell](https://github.com/georgewhewell)
 - Ahmed Sa3d, [zee93](https://github.com/zee93)
+- Olle Vidner, [ovidner](https://github.com/ovidner)

requirements.txt

@@ -1,3 +1,3 @@
-django>=1.6,<1.10
+django>=1.6,<1.11
 djangorestframework<4.0
 python-social-auth>=0.2.19

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist=
-    py{27,34}-django{17,18,19},
-    py{35}-django{18,19}
+    py{27,34}-django{18,19,110},
+    py{35}-django{18,19,110}
 
 [testenv]
 setenv =
@@ -14,16 +14,16 @@ basepython =
 deps =
     djangorestframework<4.0
     python-social-auth==0.2.9
-    django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
-    py27-django19: djangorestframework-jwt
-    py27-django19: coverage
+    django110: Django>=1.10,<1.11
+    py27-django110: djangorestframework-jwt
+    py27-django110: coverage
     -rrequirements_test.txt
 commands =
     py.test
 
-[testenv:py27-django19]
+[testenv:py27-django110]
 commands =
     coverage run --source=rest_social_auth -m py.test
     coverage report