From 2166e4c25992f5e653be343b4f49edd984e10338 Mon Sep 17 00:00:00 2001
From: James Turk <james.p.turk@gmail.com>
Date: Wed, 28 Oct 2015 22:02:57 -0400
Subject: [PATCH 1/2] fix OrderedDict import for drf3.3

---
 rest_framework_json_api/pagination.py | 2 +-
 rest_framework_json_api/utils.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework_json_api/pagination.py b/rest_framework_json_api/pagination.py
index 8551dd77..e8b52401 100644
--- a/rest_framework_json_api/pagination.py
+++ b/rest_framework_json_api/pagination.py
@@ -1,9 +1,9 @@
 """
 Pagination fields
 """
+from collections import OrderedDict
 from rest_framework import serializers
 from rest_framework.views import Response
-from rest_framework.compat import OrderedDict
 from rest_framework.pagination import PageNumberPagination
 from rest_framework.templatetags.rest_framework import replace_query_param
 
diff --git a/rest_framework_json_api/utils.py b/rest_framework_json_api/utils.py
index cc207a61..5dfa8c69 100644
--- a/rest_framework_json_api/utils.py
+++ b/rest_framework_json_api/utils.py
@@ -2,12 +2,12 @@
 Utils.
 """
 import copy
+from collections import OrderedDict
 
 import inflection
 from django.conf import settings
 from django.utils import six, encoding
 from django.utils.translation import ugettext_lazy as _
-from rest_framework.compat import OrderedDict
 from rest_framework.serializers import BaseSerializer, ListSerializer, ModelSerializer
 from rest_framework.relations import RelatedField, HyperlinkedRelatedField, PrimaryKeyRelatedField, \
     HyperlinkedIdentityField

From 075ac720709c3f8005a80b0e73773867d0c095ff Mon Sep 17 00:00:00 2001
From: James Turk <james.p.turk@gmail.com>
Date: Wed, 28 Oct 2015 22:03:09 -0400
Subject: [PATCH 2/2] start testing on drf3.3

---
 .travis.yml | 10 ++++++----
 tox.ini     | 11 ++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 05761807..ec66ad00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,23 +6,25 @@ script: tox
 env:
   - TOXENV=py27-django17-drf31
   - TOXENV=py27-django17-drf32
-  - TOXENV=py32-django17-drf31
-  - TOXENV=py32-django17-drf32
   - TOXENV=py33-django17-drf31
   - TOXENV=py33-django17-drf32
   - TOXENV=py34-django17-drf31
   - TOXENV=py34-django17-drf32
   - TOXENV=py27-django18-drf31
   - TOXENV=py27-django18-drf32
-  - TOXENV=py32-django18-drf31
-  - TOXENV=py32-django18-drf32
+  - TOXENV=py27-django18-drf33
   - TOXENV=py33-django18-drf31
   - TOXENV=py33-django18-drf32
+  - TOXENV=py33-django18-drf33
   - TOXENV=py34-django18-drf31
   - TOXENV=py34-django18-drf32
+  - TOXENV=py34-django18-drf33
   - TOXENV=py27-django19-drf31
   - TOXENV=py27-django19-drf32
+  - TOXENV=py27-django19-drf33
   - TOXENV=py34-django19-drf31
   - TOXENV=py34-django19-drf32
+  - TOXENV=py34-django19-drf33
   - TOXENV=py35-django19-drf31
   - TOXENV=py35-django19-drf32
+  - TOXENV=py35-django19-drf33
diff --git a/tox.ini b/tox.ini
index db7ef1d1..fbb33a91 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,17 @@
 [tox]
 envlist =
-    py{27,32,33,34}-django17-drf{31,32},
-    py{27,32,33,34}-django18-drf{31,32},
-    py{27,34,35}-django19-drf{31,32},
+    py{27,33,34}-django17-drf{31,32},
+    py{27,33,34}-django18-drf{31,32,33},
+    py{27,34,35}-django19-drf{31,32,33},
 
 [testenv]
 deps =
     django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
-    django19: Django>=1.9a1
+    django19: Django>=1.9b1
     drf31: djangorestframework>=3.1,<3.2
-    drf32: djangorestframework>=3.2
+    drf32: djangorestframework>=3.2,<3.3
+    drf33: djangorestframework>=3.3,<3.4
     -r{toxinidir}/requirements-development.txt
 
 setenv= DJANGO_SETTINGS_MODULE=example.settings.test