Merge pull request #20 from drgarcia1986/django18

add support to Django 1.8
drgarcia1986 · Apr 11, 2015 · 80e8352 · 80e8352
2 parents 6733363 + 5e7cf60
commit 80e8352
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,9 @@ env:
   - TOX_ENV=py27-django17-drf2
   - TOX_ENV=py27-django17-drf3
   - TOX_ENV=py27-django17-drf31
+  - TOX_ENV=py27-django18-drf2
+  - TOX_ENV=py27-django18-drf3
+  - TOX_ENV=py27-django18-drf31
   - TOX_ENV=py34-django15-drf2
   - TOX_ENV=py34-django15-drf3
   - TOX_ENV=py34-django15-drf31
@@ -21,6 +24,9 @@ env:
   - TOX_ENV=py34-django17-drf2
   - TOX_ENV=py34-django17-drf3
   - TOX_ENV=py34-django17-drf31
+  - TOX_ENV=py34-django18-drf2
+  - TOX_ENV=py34-django18-drf3
+  - TOX_ENV=py34-django18-drf31
 
 install:
   - make requirements

diff --git a/docs/index.md b/docs/index.md
@@ -8,7 +8,7 @@ Requirements
 ------------
 
 * Python (2.7, 3.4)
-* Django (1.5, 1.6, 1.7)
+* Django (1.5, 1.6, 1.7, 1.8)
 
 
 Installation

diff --git a/examples/requirements.txt b/examples/requirements.txt
@@ -1,4 +1,4 @@
-Django==1.7.5
+Django==1.8
 Pillow==2.7.0
 djangorestframework==3.0.5
 drf-pdf==0.1.0

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    {py27,py34}-django{15,16,17}-drf{2,3,31}
+    {py27,py34}-django{15,16,17,18}-drf{2,3,31}
 
 [testenv]
 setenv =
@@ -10,7 +10,8 @@ deps =
     pytest-cov
     django15: Django>=1.5,<1.6
     django16: Django>=1.6,<1.7
-    django17: Django>=1.7
+    django17: Django>=1.7,<1.8
+    django18: Django>=1.8
     drf2: djangorestframework>=2.4
     drf3: djangorestframework>=3.0
     drf31: djangorestframework>=3.1