Merge pull request #13 from mrjmad/master

Add support (in tox) for Python 3.6. Add PG configuration for Travis.

Author: ewjoachim

.travis.yml

@@ -1,6 +1,12 @@
 # Config file for automatic testing at travis-ci.org
 language: python
 
+services:
+  - postgresql
+
+env:
+  global : DATABASE_URL=postgres://postgres:@127.0.0.1:5432
+
 matrix:
     include:
       # Python version is just for the look on travis.
@@ -49,6 +55,12 @@ matrix:
         - python: 3.5
           env: TOX_ENV=py35-djangostable
 
+        - python: 3.6
+          env: TOX_ENV=py36-django111
+
+        - python: 3.6
+          env: TOX_ENV=py36-djangostable
+
         - env: TOX_ENV=linters
 
 install:

setup.py

@@ -54,6 +54,7 @@
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Framework :: Django',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
@@ -63,5 +64,6 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 skipsdist = True
 envlist =
-    {py27,py34,py35}-django{18,19,110,111,stable},linters
+    {py27,py34,py35}-django{18,19,110,111,stable},{py36}-django{111,stable},linters
 
 [testenv]
 passenv = DATABASE_URL COVERAGE