Merge pull request #278 from ariovistus/master

release 0.3.0
marcgibbons · May 15, 2015 · b15cac5 · b15cac5
2 parents 3bdba00 + 96065d3
commit b15cac5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,6 +28,11 @@ env:
     - TOX_ENV=py27-django1.7-drf3.0.0
     - TOX_ENV=py27-django1.7-drf3.0.1
     - TOX_ENV=py27-django1.7-drf3.1.1
+    - TOX_ENV=py27-django1.8-drf2.3.8
+    - TOX_ENV=py27-django1.8-drf2.4.3
+    - TOX_ENV=py27-django1.8-drf3.0.0
+    - TOX_ENV=py27-django1.8-drf3.0.1
+    - TOX_ENV=py27-django1.8-drf3.1.1
     - TOX_ENV=py32-django1.5-drf2.3.8
     - TOX_ENV=py32-django1.5-drf2.4.3
     - TOX_ENV=py32-django1.5-drf3.0.0
@@ -43,6 +48,11 @@ env:
     - TOX_ENV=py32-django1.7-drf3.0.0
     - TOX_ENV=py32-django1.7-drf3.0.1
     - TOX_ENV=py32-django1.7-drf3.1.1
+    - TOX_ENV=py32-django1.8-drf2.3.8
+    - TOX_ENV=py32-django1.8-drf2.4.3
+    - TOX_ENV=py32-django1.8-drf3.0.0
+    - TOX_ENV=py32-django1.8-drf3.0.1
+    - TOX_ENV=py32-django1.8-drf3.1.1
     - TOX_ENV=py33-django1.5-drf2.3.8
     - TOX_ENV=py33-django1.5-drf2.4.3
     - TOX_ENV=py33-django1.5-drf3.0.0
@@ -58,6 +68,11 @@ env:
     - TOX_ENV=py33-django1.7-drf3.0.0
     - TOX_ENV=py33-django1.7-drf3.0.1
     - TOX_ENV=py33-django1.7-drf3.1.1
+    - TOX_ENV=py33-django1.8-drf2.3.8
+    - TOX_ENV=py33-django1.8-drf2.4.3
+    - TOX_ENV=py33-django1.8-drf3.0.0
+    - TOX_ENV=py33-django1.8-drf3.0.1
+    - TOX_ENV=py33-django1.8-drf3.1.1
     - TOX_ENV=py34-django1.5-drf2.3.8
     - TOX_ENV=py34-django1.5-drf2.4.3
     - TOX_ENV=py34-django1.5-drf3.0.0
@@ -73,6 +88,11 @@ env:
     - TOX_ENV=py34-django1.7-drf3.0.0
     - TOX_ENV=py34-django1.7-drf3.0.1
     - TOX_ENV=py34-django1.7-drf3.1.1
+    - TOX_ENV=py34-django1.8-drf2.3.8
+    - TOX_ENV=py34-django1.8-drf2.4.3
+    - TOX_ENV=py34-django1.8-drf3.0.0
+    - TOX_ENV=py34-django1.8-drf3.0.1
+    - TOX_ENV=py34-django1.8-drf3.1.1
 
 matrix:
   fast_finish: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Release Notes:
 
+### v0.3.0 (May 14, 2015)
+* fixes for DRF 3.1.1
+* fixes for Django 1.8
+
 ### v0.2.9 (March 6, 2015)
 * fix reStructuredText in docstring
 * fix NullBooleanField data type detection

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ for more information, see the [documentation][docs].
 
 ## Requirements
 * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.5.5+, 1.6, 1.7)
+* Django (1.5.5+, 1.6, 1.7, 1.8)
 * Django REST framework (2.3.8+)
 
 ## Bugs & Contributions

diff --git a/rest_framework_swagger/__init__.py b/rest_framework_swagger/__init__.py
@@ -1,4 +1,4 @@
-VERSION = '0.2.9'
+VERSION = '0.3.0'
 
 DEFAULT_SWAGGER_SETTINGS = {
     'exclude_namespaces': [],

diff --git a/tox.ini b/tox.ini
@@ -2,21 +2,22 @@
 envlist =
     py27-flake8,
     py26-django{1.5,1.6}-drf{2.3.8,2.4.3,3.0.0,3.0.1,3.1.1},
-    {py27,py32,py33,py34}-django{1.5,1.6,1.7}-drf{2.3.8,2.4.3,3.0.0,3.0.1,3.1.1}
+    {py27,py32,py33,py34}-django{1.5,1.6,1.7,1.8}-drf{2.3.8,2.4.3,3.0.0,3.0.1,3.1.1}
 
 [testenv]
 commands = ./runtests.py --stop
 deps =
     django1.5: Django==1.5.11
     django1.6: Django==1.6.8
     django1.7: Django==1.7.1
+    django1.8: Django==1.8.1
     drf2.3.8: djangorestframework==2.3.8
     drf2.4.3: djangorestframework==2.4.3
     drf3.0.0: djangorestframework==3.0.0
     drf3.0.1: djangorestframework==3.0.1
     drf3.1.1: djangorestframework==3.1.1
-    {py27,py32,py33,py34}-django{1.5,1.6,1.7}-drf{2.3.8,2.4.3}: PyYAML==3.10
-    {py27,py32,py33,py34}-django{1.5,1.6,1.7}-drf{2.3.8,2.4.3,3.0.0,3.0.1,3.1.1}: Markdown==2.5.1
+    {py27,py32,py33,py34}-django{1.5,1.6,1.7,1.8}-drf{2.3.8,2.4.3}: PyYAML==3.10
+    {py27,py32,py33,py34}-django{1.5,1.6,1.7,1.8}-drf{2.3.8,2.4.3,3.0.0,3.0.1,3.1.1}: Markdown==2.5.1
     py26-django{1.5,1.6}-drf{2.3.8,2.4.3,3.0.0,3.0.1,3.1.1}: Markdown==2.1.1
     py26-django{1.5,1.6}-drf{2.3.8,2.4.3}: importlib==1.0.1
     py26-django{1.5,1.6}-drf{2.3.8,2.4.3}: ordereddict==1.1
@@ -25,7 +26,7 @@ deps =
     argh==0.23.2
     nose==1.3.0
     mock==1.0.1
-    django-nose==1.2
+    django-nose==1.4
     coverage==3.6
 
 [testenv:py27-flake8]