Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tested against Django 1.11 #15

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Tested against Django 1.11 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53783e6
tested against django 1.11
barseghyanartur Jan 11, 2018
2c092d9
twilio pinned be less than 6.x release
barseghyanartur Jan 11, 2018
3772661
import resolve from django.urls on failures
barseghyanartur Jan 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions Changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion deux/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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):

Expand Down
2 changes: 1 addition & 1 deletion requirements/default.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions requirements/test-django111.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
django>=1.11,<1.12
2 changes: 2 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down