Merge pull request #154 from rpkilby/py36

Ryan P Kilby · web-flow · commit 29ba9321a608 · 2016-12-27T16:28:25.000-05:00
Add python 3.6 to build matrix
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 env:
   - DJANGO="django>=1.10.0,<1.11.0" REST_FRAMEWORK="djangorestframework>=3.5,<3.6"
   - DJANGO="django>=1.9.0,<1.10.0" REST_FRAMEWORK="djangorestframework>=3.5,<3.6"
diff --git a/tests/settings.py b/tests/settings.py
@@ -19,6 +19,7 @@
     'django.contrib.contenttypes',
     'django.contrib.staticfiles',
     'rest_framework',
+    'django_filters',
     'tests.testapp',
 )
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`'django.contrib.contenttypes',`
`20`	`20`	`'django.contrib.staticfiles',`
`21`	`21`	`'rest_framework',`
	`22`	`+ 'django_filters',`
`22`	`23`	`'tests.testapp',`
`23`	`24`	`)`
`24`	`25`