Skip to content

Commit

Permalink
Update django-rest-framework to v3.1.0 or later
Browse files Browse the repository at this point in the history
  • Loading branch information
LilyFoote committed Mar 6, 2015
1 parent 5b3c3b8 commit ad80d1f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


install_requires = (
'djangorestframework>=3.0.5,<3.1',
'djangorestframework>=3.1.0,<3.2',
'incuna_mail>=2.0.0,<4.0.0',
)

Expand Down
4 changes: 0 additions & 4 deletions user_management/api/tests/test_views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import datetime
import re
from collections import OrderedDict
from unittest import expectedFailure

from django.contrib.auth import get_user_model
from django.contrib.auth.hashers import check_password
Expand Down Expand Up @@ -326,9 +325,6 @@ def test_send_email(self):
self.assertIn('auth/password_reset/confirm/', sent_mail.body)
self.assertIn('https://', sent_mail.body)

# max_length is incorrectly missing from options, fixed in:
# https://github.com/tomchristie/django-rest-framework/commit/c8609ba652e1752e690c9e27e02b3531589d0c2c
@expectedFailure
def test_options(self):
"""
Ensure information about email field is included in options request.
Expand Down

0 comments on commit ad80d1f

Please sign in to comment.