Merge pull request #25 from luizalabs/jh-update_dependencies

update dependencies

.travis.yml

@@ -17,6 +17,7 @@ env:
    - DJANGO="Django<1.9"
    - DJANGO="Django<1.10"
    - DJANGO="Django<1.11"
+   - DJANGO="Django<1.12"
 
 script:
   - make check coverage

requirements-dev.txt

@@ -1,12 +1,12 @@
 -e .
 bumpversion==0.5.3
-django-oauth-toolkit==0.10.0
-djangorestframework==3.5.3
-flake8==3.0.4
+django-oauth-toolkit==0.12.0
+djangorestframework==3.6.2
+flake8==3.3.0
 isort==4.2.5
-mixer==5.5.8
-mkdocs==0.16.0
+mixer==5.6.6
+mkdocs==0.16.3
 mock==2.0.0
 pytest-cov==2.4.0
-pytest-django==3.0.0
-pytest==3.0.4
+pytest-django==3.1.2
+pytest==3.0.7

setup.py

@@ -9,6 +9,7 @@ def read(fname):
     with open(path) as f:
         return f.read()
 
+
 setup(
     name='luizalabs-django-toolkit',
     version='1.3.5',

tests/oauth2/conftest.py

@@ -2,9 +2,9 @@
 from datetime import timedelta
 
 import pytest
+from django.contrib.auth import get_user_model
 from django.core.cache import caches
 from django.utils import timezone
-from oauth2_provider.compat import get_user_model
 from oauth2_provider.models import AccessToken, get_application_model