Merge pull request #163 from sunscrapers/django_rest_framework_34

Add to tox environments for testing Django REST framework 3.4.

.travis.yml

@@ -4,18 +4,18 @@ python:
   - "3.5"
 env:
   - TOX_ENV=py27-dj17-drf33
-  - TOX_ENV=py27-dj18-drf33
-  - TOX_ENV=py27-dj19-drf33
-  - TOX_ENV=py27-dj110-drf33
   - TOX_ENV=py33-dj17-drf33
   - TOX_ENV=py34-dj17-drf33
-  - TOX_ENV=py33-dj18-drf33
-  - TOX_ENV=py34-dj18-drf33
-  - TOX_ENV=py35-dj18-drf33
-  - TOX_ENV=py34-dj19-drf33
-  - TOX_ENV=py35-dj19-drf33
-  - TOX_ENV=py34-dj110-drf33
-  - TOX_ENV=py35-dj110-drf33
+  - TOX_ENV=py27-dj18-drf34
+  - TOX_ENV=py27-dj19-drf34
+  - TOX_ENV=py27-dj110-drf34
+  - TOX_ENV=py33-dj18-drf34
+  - TOX_ENV=py34-dj18-drf34
+  - TOX_ENV=py35-dj18-drf34
+  - TOX_ENV=py34-dj19-drf34
+  - TOX_ENV=py34-dj110-drf34
+  - TOX_ENV=py35-dj19-drf34
+  - TOX_ENV=py35-dj110-drf34
 
 install:
   - travis_retry pip install virtualenv tox

tox.ini

@@ -1,10 +1,11 @@
 [tox]
 downloadcache = {toxworkdir}/cache/
 envlist =
-    py27-dj{17,18,19,110}-drf33,
+    py27-dj17-drf33,
     py{33,34}-dj17-drf33,
-    py{33,34,35}-dj18-drf33,
-    py{34,35}-dj{19,110}-drf33
+    py27-dj{18,19,110}-drf34,
+    py{33,34,35}-dj18-drf34,
+    py{34,35}-dj{19,110}-drf34
 
 [testenv]
 basepython =
@@ -18,6 +19,7 @@ deps =
     dj19: django>=1.9,<1.10
     dj110: django>=1.10,<1.11
     drf33: djangorestframework>=3.3,<3.4
+    drf34: djangorestframework>=3.4,<3.5
     py27: mock
     -rrequirements-test.txt
 commands = coverage run --source=djoser testproject/manage.py test testapp