Merge pull request #6 from maryokhin/master

Update Travis and tox configs.

Author: jpadilla

{{ cookiecutter.repo_name }}/.travis.yml

@@ -5,30 +5,33 @@ sudo: false
 env:
     - TOX_ENV=py27-flake8
     - TOX_ENV=py27-docs
-    - TOX_ENV=py27-django1.6-drf2.4.3
-    - TOX_ENV=py27-django1.6-drf2.4.4
-    - TOX_ENV=py27-django1.6-drf3.0.0
-    - TOX_ENV=py27-django1.7-drf2.4.3
-    - TOX_ENV=py27-django1.7-drf2.4.4
-    - TOX_ENV=py27-django1.7-drf3.0.0
-    - TOX_ENV=py32-django1.6-drf2.4.3
-    - TOX_ENV=py32-django1.6-drf2.4.4
-    - TOX_ENV=py32-django1.6-drf3.0.0
-    - TOX_ENV=py32-django1.7-drf2.4.3
-    - TOX_ENV=py32-django1.7-drf2.4.4
-    - TOX_ENV=py32-django1.7-drf3.0.0
-    - TOX_ENV=py33-django1.6-drf2.4.3
-    - TOX_ENV=py33-django1.6-drf2.4.4
-    - TOX_ENV=py33-django1.6-drf3.0.0
-    - TOX_ENV=py33-django1.7-drf2.4.3
-    - TOX_ENV=py33-django1.7-drf2.4.4
-    - TOX_ENV=py33-django1.7-drf3.0.0
-    - TOX_ENV=py34-django1.6-drf2.4.3
-    - TOX_ENV=py34-django1.6-drf2.4.4
-    - TOX_ENV=py34-django1.6-drf3.0.0
-    - TOX_ENV=py34-django1.7-drf2.4.3
-    - TOX_ENV=py34-django1.7-drf2.4.4
-    - TOX_ENV=py34-django1.7-drf3.0.0
+    - TOX_ENV=py27-django1.6-drf2.4
+    - TOX_ENV=py27-django1.6-drf3.0
+    - TOX_ENV=py27-django1.6-drf3.1
+    - TOX_ENV=py27-django1.7-drf2.4
+    - TOX_ENV=py27-django1.7-drf3.0
+    - TOX_ENV=py27-django1.7-drf3.1
+    - TOX_ENV=py27-django1.8-drf2.4
+    - TOX_ENV=py27-django1.8-drf3.0
+    - TOX_ENV=py27-django1.8-drf3.1
+    - TOX_ENV=py33-django1.6-drf2.4
+    - TOX_ENV=py33-django1.6-drf3.0
+    - TOX_ENV=py33-django1.6-drf3.1
+    - TOX_ENV=py33-django1.7-drf2.4
+    - TOX_ENV=py33-django1.7-drf3.0
+    - TOX_ENV=py33-django1.7-drf3.1
+    - TOX_ENV=py33-django1.8-drf2.4
+    - TOX_ENV=py33-django1.8-drf3.0
+    - TOX_ENV=py33-django1.8-drf3.1
+    - TOX_ENV=py34-django1.6-drf2.4
+    - TOX_ENV=py34-django1.6-drf3.0
+    - TOX_ENV=py34-django1.6-drf3.1
+    - TOX_ENV=py34-django1.7-drf2.4
+    - TOX_ENV=py34-django1.7-drf3.0
+    - TOX_ENV=py34-django1.7-drf3.1
+    - TOX_ENV=py34-django1.8-drf2.4
+    - TOX_ENV=py34-django1.8-drf3.0
+    - TOX_ENV=py34-django1.8-drf3.1
 
 matrix:
   fast_finish: true

{{ cookiecutter.repo_name }}/README.md

@@ -10,8 +10,8 @@
 ## Requirements
 
 * Python (2.7, 3.3, 3.4)
-* Django (1.6, 1.7)
-* Django REST Framework (2.4.3, 2.4.4, 3.0-beta)
+* Django (1.6, 1.7, 1.8)
+* Django REST Framework (2.4, 3.0, 3.1)
 
 ## Installation
 

{{ cookiecutter.repo_name }}/tox.ini

@@ -1,25 +1,26 @@
 [tox]
 envlist =
        py27-{flake8,docs},
-       {py27,py33,py34}-django{1.6,1.7}-drf{2.4.3,2.4.4,3.0}
+       {py27,py33,py34}-django{1.6,1.7,1.8}-drf{2.4,3.0,3.1}
 
 [testenv]
 commands = ./runtests.py --fast
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
-       django1.6: Django==1.6.8
-       django1.7: Django==1.7.1
-       drf2.4.3: djangorestframework==2.4.3
-       drf2.4.4: djangorestframework==2.4.4
-       drf3.0.0: djangorestframework==3.0.0
+       django1.6: Django==1.6.11
+       django1.7: Django==1.7.7
+       django1.8: Django==1.8
+       drf2.4: djangorestframework==2.4.4
+       drf3.0: djangorestframework==3.0.5
+       drf3.1: djangorestframework==3.1.1
        pytest-django==2.6.1
 
 [testenv:py27-flake8]
 commands = ./runtests.py --lintonly
 deps =
-       pytest==2.5.2
-       flake8==2.2.2
+       pytest==2.7.0
+       flake8==2.4.0
 
 [testenv:py27-docs]
 commands = mkdocs build