diff --git a/.travis.yml b/.travis.yml index 40dad89..a9a092e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ env: - TOXENV=pypy-django1.9 - TOXENV=3.4-django1.10 - TOXENV=3.4-django1.9 + - TOXENV=3.5-django1.11 - TOXENV=3.5-django1.10 - TOXENV=3.5-django1.9 - TOXENV=flake8 diff --git a/Changelog b/Changelog index 3894a63..7a8ea36 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,14 @@ Changelog ========== +1.2.1 +===== +:release-date: 2018-mm-dd hh:mm P.M PDT +:release-by: Maintainer + +- [fixes] Too many to list +- [tested] Tested against Django 1.11. + 1.2.0 ===== :release-date: 2016-10-28 06:00 P.M PDT diff --git a/deux/tests/test_views.py b/deux/tests/test_views.py index 072b46b..aa8b01a 100644 --- a/deux/tests/test_views.py +++ b/deux/tests/test_views.py @@ -2,7 +2,6 @@ from mock import patch -from django.core.urlresolvers import reverse from rest_framework import status from deux.app_settings import mfa_settings @@ -13,6 +12,10 @@ from .test_base import BaseUserTestCase +try: + from django.core.urlresolvers import reverse +except ImportError: + from django.urls import reverse class _BaseMFAViewTest(BaseUserTestCase): diff --git a/requirements/default.txt b/requirements/default.txt index f5e0258..7f91414 100644 --- a/requirements/default.txt +++ b/requirements/default.txt @@ -2,4 +2,4 @@ djangorestframework>=2.4.3 django-oauth-toolkit>=0.10.0 django-otp>=0.3.5 six>=1.10.0 -twilio>=5.4.0 +twilio>=5.4.0,<6.0.0 diff --git a/requirements/test-django111.txt b/requirements/test-django111.txt new file mode 100644 index 0000000..47e435b --- /dev/null +++ b/requirements/test-django111.txt @@ -0,0 +1 @@ +django>=1.11,<1.12 diff --git a/tox.ini b/tox.ini index 15289bf..38603a4 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,7 @@ envlist = pypy-django1.9 3.4-django1.10 3.4-django1.9 + 3.5-django1.11 3.5-django1.10 3.5-django1.9 @@ -21,6 +22,7 @@ deps= -r{toxinidir}/requirements/test.txt -r{toxinidir}/requirements/test-ci.txt + django1.11: -r{toxinidir}/requirements/test-django111.txt django1.10: -r{toxinidir}/requirements/test-django110.txt django1.9: -r{toxinidir}/requirements/test-django19.txt